completed upgrade to SDK 2.0

Hopefully this be a good one.