changes for 2.2 release
My changes