Added auto deactivation.