updates after pre 1.1 changes