Doing refactor for shipment planning.