Master reworked