add auto deactivation