added activate/deactivate feature