no longer need to have MasterSwitch turned off at these places