activation/deactivation added