Added automatic restart