added activate/deactivate feature (5)