added activate/deactivate feature (2)