Refactored for Event Shipment