State activation\deactivation improvement