Phase 3.4: File in the Right Order and Manage the Wait