adding master switch back