modify to separate WAQL-REPL from WAQL