Moved everything around for final batch runs.