update to 1.2

update to 1.2