Update for 1.2