added activation/deactivation functions