Refactored Order.