Updating for SDK 18