Partial work on fixing rerun