Cahnge made to interactive mode, to allow early exit.