In this part: Remove need for re-runs