Improvements to activate/deactivate