Improved with correct handling of drop shipment returns.