Moved the enable/disable methods to after the callbacks.