Updates to how the master works