add auto activate feature