Updated to new SDK