Updated re-run logic