Partial work on fixing rerun
From:
User: mrwellan