Ver. 10

Bugs fixed