Upgraded to SDK 2.0