added activate/deactivate feature (8)