converted to SDK 2.0