activation and deactivation modified