updated to use SDK 21