Faster reparsing implemented