Updated to SDK 2.6