Added enable/disable switch