added activate/deactivate feature (7)