ichanged_v1.2
fix bugs