added 1.2 changes