diff --git a/chatBot/commands/8ball.js b/chatBot/commands/8ball.js
index d9cb238..0fc287f 100644
--- a/chatBot/commands/8ball.js
+++ b/chatBot/commands/8ball.js
@@ -4,6 +4,6 @@ export default {
     handler: function(bot, args, message) {
       const responses = ['It is certain.', 'It is decidedly so.', 'Without a doubt.', 'Yes - definitely.', 'You may rely on it.', 'As I see it, yes.', 'Most likely.', 'Outlook good.', 'Yes.', 'Signs point to yes.', 'Reply hazy, try again.', 'Ask again later.', 'Better not tell you now.', 'Cannot predict now.', 'Concentrate and ask again.', 'Don\'t count on it.', 'My reply is no.', 'My sources say no.', 'Outlook not so good.', 'Very doubtful.'];
       const randomIndex = Math.floor(Math.random() * responses.length);
-      bot.sendMessage(responses[randomIndex]);
+      bot.sendMessage(message.peers, responses[randomIndex]);
     }
   };
\ No newline at end of file
diff --git a/chatBot/commands/hello.js b/chatBot/commands/hello.js
index 8bf16c2..1c0ee81 100644
--- a/chatBot/commands/hello.js
+++ b/chatBot/commands/hello.js
@@ -3,6 +3,6 @@ export default {
     description: 'Greet the user',
     handler: function(bot, args, message) {
       const userName = message.name;
-      bot.sendMessage(`Hello, ${userName}! How can I assist you today?`);
+      bot.sendMessage(message.peers, `Hello, ${userName}! How can I assist you today?`);
     }
   };
\ No newline at end of file
diff --git a/chatBot/commands/ping.js b/chatBot/commands/ping.js
index df71415..16f26a4 100644
--- a/chatBot/commands/ping.js
+++ b/chatBot/commands/ping.js
@@ -2,6 +2,6 @@
 
 export default {
     handler: function(bot, args, message) {
-      bot.sendMessage('Pong!');
+      bot.sendMessage(message.peers, 'Pong!');
     }
   };
\ No newline at end of file
diff --git a/chatBot/includes/client.js b/chatBot/includes/client.js
index 6df8ff4..2de7175 100644
--- a/chatBot/includes/client.js
+++ b/chatBot/includes/client.js
@@ -32,10 +32,11 @@ class Client extends EventEmitter {
     });
   }
 
-  sendMessage(message) {
+  sendMessage(roomPeers, message) {
     console.log('Bot name:', this.botName);
     const timestamp = Date.now(); // Generate timestamp
-    const peers = [...this.swarm.connections];
+    const peers = [...this.swarm.connections].filter(peer => roomPeers.includes(peer.remotePublicKey.toString('hex')));
+    console.log(`Sending message ${message} to peers ${peers}`)
     const data = JSON.stringify({name: this.botName, message, timestamp}); // Include timestamp
     for (const peer of peers) peer.write(data);
   }