Added automatic activation