added activate/deactivate