almost done with update 1.2 :)