edited mastercontroler