nearly done v1.2 changes