added 1.1-1.2 changes