diff --git a/src/crypto/crypto.service.ts b/src/crypto/crypto.service.ts
index b829cb4..3aaf9b4 100644
--- a/src/crypto/crypto.service.ts
+++ b/src/crypto/crypto.service.ts
@@ -40,9 +40,11 @@ export class CryptoService {
         where: {
           id: cryptoId,
         },
+
         orderBy: {
           created_at: 'desc',
         },
+        take: 50,
       });
     } else {
       throw new ForbiddenException('Crypto UUID required');
diff --git a/src/trade/trade.service.ts b/src/trade/trade.service.ts
index fd94a8e..d44d6df 100644
--- a/src/trade/trade.service.ts
+++ b/src/trade/trade.service.ts
@@ -13,9 +13,28 @@ export class TradeService {
       orderBy: {
         created_at: 'desc',
       },
-      include: {
-        Giver: true,
-        Receiver: true,
+      // include: {
+      //   Giver: true,
+      //   Receiver: true,
+      //   Crypto: true,
+      // },
+
+      select: {
+        Giver: {
+          select: {
+            firstName: true,
+            lastName: true,
+            pseudo: true,
+          },
+        },
+        Receiver: {
+          select: {
+            firstName: true,
+            lastName: true,
+            pseudo: true,
+            dollarAvailables: true,
+          },
+        },
         Crypto: true,
       },
     });