Added disable switch.