Changed lexer again