before major changes to master_control