Ver 1.2

Not finished