Improvements to the pre-run flow