Updated for the new master branch version