Updated off/on methods to disable/enable