diff --git a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
index 7c4a745d..98635a6a 100644
--- a/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
+++ b/app/Classes/Modules/Exports/Services/ExportsArrivedParcel.php
@@ -7,7 +7,7 @@ use App\Models\CompanyModule;
 use App\Models\Order;
 use App\Models\PackingList;
 use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithMapping;
 use Maatwebsite\Excel\Concerns\WithHeadings;
@@ -16,7 +16,7 @@ use Carbon\Carbon;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 
-class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromCollection
+class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, FromQuery
 {
 
     use Exportable;
@@ -38,26 +38,18 @@ class ExportsArrivedParcel implements WithHeadings, WithHeadingRow, WithMapping,
     /**
      * @return \Illuminate\Support\Collection|mixed
      */
-    public function collection()
+    public function query()
     {
-        $returnArray = collect();
-
-        $packingLists = PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class)->get();
-dd($packingLists);
-        foreach($packingLists as $packingList){
-            $packages = !$packingList->packingLists()->exists() ? $packingList->packages : $packingList->packingLists->first()->packages;
-            $returnArray->push($packages);
-        }
-
-        return $returnArray->flatten();
+        return PackingList::where('type', '=', 1)->where('status', '=', 2)->where('owner_type', Order::class);
     }
 
     /**
      * @param $package
      * @return array
      */
-    public function map($package): array
+    public function map($packingList): array
     {
+        dd($packingList);
         $packingList = $package->packingList;
         $order = $packingList->owner;