Finishes the order rework, back where we started