REPL improved