Updated Lexer :)