Update for v1.2