Added ability to toggle wherever On / Off is used.