added activate/deactivate feature (6)