Updating from my working SDK