Update to 1.2

Update to 1.2