Added activation and deactivation feature