Some rework on create order.