updated old lexer to be compatible with new one