Upgraded to SDK 2.2