Added functions to lexer-new.rs