improvements for the last minute re-run