Update to SDK 2