Added option to disable the switch