Added enable switch