reverted to lexer/parser from 3c8f910