Reworked the prototype master.