Updated to prelaunch 1.2