Improvements to the shipments procedures