diff --git a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersV2Logic.php b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersV2Logic.php
index c563051d..40b36db5 100644
--- a/app/Classes/Modules/Orders/ControllersLogic/ListOrdersV2Logic.php
+++ b/app/Classes/Modules/Orders/ControllersLogic/ListOrdersV2Logic.php
@@ -8,16 +8,20 @@ use App\Classes\Modules\Orders\Services\ListsOrders;
 use App\Classes\Modules\Orders\Standards\Rules\CanListOrders;
 use App\Classes\ValueObjects\Constants\OrderType;
 use App\Http\Resources\OrderV2Resource;
+use App\Transformers\DocumentTransformer;
+use App\Transformers\OrderTransformer;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use League\Fractal\Serializer\ArraySerializer;
 
 class ListOrdersV2Logic extends AbstractControllerLogic
 {
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Retrieved Orders',
             'message' => 'You have successfully retrieved a list of Orders'
@@ -41,16 +45,23 @@ class ListOrdersV2Logic extends AbstractControllerLogic
         $this->listsOrders = $listsOrders;
     }
 
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canListOrders->passes();
 
         $query = $this->listsOrders->execute(array_merge($this->listsOrders->deserializeFilters($request->input('filters')), ['with_parcels' => true, 'type_in' => [OrderType::SHARED_CONTAINER, OrderType::DEDICATED_CONTAINER]]));
 
-        return $this->collectionResponse(OrderV2Resource::collection($query));
+
+        //   return $this->collectionResponse(OrderV2Resource::collection($query));
+
+        return fractal()
+            ->parseIncludes(['remarks', 'warehouse', 'address'])
+            ->collection($query, new OrderTransformer(), "data")
+            ->serializeWith(new ArraySerializer())
+            ->respond(200, [], JSON_PRETTY_PRINT);
+
 
     }
 
 
-
 }
diff --git a/app/Transformers/AddressTransformer.php b/app/Transformers/AddressTransformer.php
index 3eeeb999..b9898da1 100644
--- a/app/Transformers/AddressTransformer.php
+++ b/app/Transformers/AddressTransformer.php
@@ -18,9 +18,9 @@ class AddressTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
-        'contact',
-        'remark'
+    protected array $defaultIncludes = [
+
+
     ];
 
     /**
@@ -28,9 +28,11 @@ class AddressTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         'company_module',
         'Owner_address',
+        'remark',
+        'contact',
 
     ];
 
diff --git a/app/Transformers/OrderTransformer.php b/app/Transformers/OrderTransformer.php
index ab5c0c35..8313ab65 100644
--- a/app/Transformers/OrderTransformer.php
+++ b/app/Transformers/OrderTransformer.php
@@ -17,12 +17,8 @@ class OrderTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'company_module',
-        'warehouse',
-        'address',
-        'address_change_request',
-        'remarks'
 
     ];
 
@@ -31,9 +27,13 @@ class OrderTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         'parcels',
-        'invoices'
+        'invoices',
+        'warehouse',
+        'address',
+        'address_change_request',
+        'remarks'
     ];
 
     /**
diff --git a/app/Transformers/RemarkTransformer.php b/app/Transformers/RemarkTransformer.php
index ae651005..e6bb2376 100644
--- a/app/Transformers/RemarkTransformer.php
+++ b/app/Transformers/RemarkTransformer.php
@@ -14,7 +14,7 @@ class RemarkTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $defaultIncludes = [
+    protected array $defaultIncludes = [
         'commenter'
     ];
 
@@ -23,7 +23,7 @@ class RemarkTransformer extends TransformerAbstract
      *
      * @var array
      */
-    protected $availableIncludes = [
+    protected array $availableIncludes = [
         //
     ];