Added non-stop feature