Added reparsing