Refactored enable/disable func as well