updated to use the new lexer.