Updated my code to work with the latest dev branch