Update to 1.2