Updated for SDK 4.1.5