Again Master Switch
After merging