added activate/deactivate feature (3)