Update my fork with new SDK code