Upgraded to SDK v4.0