Changing master some more