adding activation/deactivation