Reordering things some more to hopefully make this work during a single run.