added activate and deactivate