Changed lexer