improve shipment generation