changes for 2.1 upgrade