v.1.6 : Almostly code stable finished