Steward: reorder for performance