diff --git a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
index 7a09bf62..cd9f9e47 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPendingArrangementDeliveryList.php
@@ -20,16 +20,19 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
     public function headings(): array
     {
         return [
-            'Order Number',
+            'Container Ref.',
+            'ETA',
+            'Unstuffing',
             'Marking',
+            'Order Number',
             'Quantity',
+            'State',
+            'Postcode',
+            'Address',
+            'PIC',
+            'Phone',
             'Remark',
-            'Contact Person Name',
-            'Contact Number',
-            'Delivery Date',
-            'Delivery Address',
-            'Delivery State',
-            'Delivery Postcode'
+            'Delay Days'
         ];
     }
 
@@ -50,26 +53,29 @@ class ExportsPendingArrangementDeliveryList implements FromQuery, WithHeadings,
      */
     public function map($packingList): array
     {
+        $container = $packingList->containers()->first();
+        $ContainerTransport = $container->transports()->first();
         $order = $packingList->owner;
         $marking = $order->companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-        $defaultAddress = $order->companyModule->addresses()->defaultAddress()->first();
-        $defaultAddress = $defaultAddress ? $defaultAddress : $order->companyModule->addresses()->first();
-        $address = $defaultAddress->street_one.', '.$defaultAddress->street_two.' '.$defaultAddress->district->name.' '.$defaultAddress->postcode.' '.$defaultAddress->state->name.' '.$defaultAddress->country->name;
-        $contacts = $defaultAddress->contacts->first() ? $defaultAddress->contacts->first(): '';
+        $address = $order->addresses()->where('status', ApprovalStatus::APPROVED)->first();
+        $contacts = $address->contacts->first() ? $address->contacts->first(): '';
         $originalPackingList = $packingList->owner instanceof PackingList ? $packingList->owner : $packingList;
         $transport = $originalPackingList->containers()->first()->transports()->first();
 
         return [
-            $order->reference,
+            $container->reference,
+            $ContainerTransport->schedules()->where('status', '=', ApprovalStatus::APPROVED)->first(),
+            $ContainerTransport->drop_date,
             $marking,
+            $order->reference,
             $packingList->packages()->sum('quantity'),
-            $defaultAddress->remarks->first() ? $defaultAddress->remarks->first()->content: '',
+            $address->state->name,
+            $address->postcode,
+            $address->street_one.', '.$address->street_two.' '.$address->district->name.' '.$address->postcode.' '.$address->state->name.' '.$address->country->name,
+            $address->remarks->first() ? $address->remarks->first()->content: '',
             $contacts ? $contacts ->reference : '',
             $contacts ? $contacts ->phone : '',
             $transport ? Carbon::now()->diffInDays($transport->drop_date, false) . ' Days' : '',
-            $address,
-            $defaultAddress->state->name,
-            $defaultAddress->postcode
         ];
     }
 }
\ No newline at end of file