New enable/disable tool ready for testing