Worked on the lexer