diff --git a/sources/commands/privmsg.cpp b/sources/commands/privmsg.cpp
index fa36e38..af046ff 100644
--- a/sources/commands/privmsg.cpp
+++ b/sources/commands/privmsg.cpp
@@ -6,7 +6,7 @@
 /*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/24 17:29:48 by rparodi           #+#    #+#             */
-/*   Updated: 2025/06/22 01:53:33 by sben-tay         ###   ########.fr       */
+/*   Updated: 2025/06/24 05:07:56 by sben-tay         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,6 +14,7 @@
 #include "commands.hpp"
 #include "logs.hpp"
 #include "bonus.hpp"
+#include <algorithm>
 
 using namespace cmd;
 
@@ -64,34 +65,48 @@ void PrivMsg::execute() {
 
 	//bonus msgBot
 	std::string msgBot = ":bot!ircbot@localhost PRIVMSG " + target + " :📜 Liste des commandes disponibles :\r\n";
-				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- JOIN #channel        → Rejoindre un canal\r\n";
-				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- PART #channel        → Quitter un canal\r\n";
-				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- PRIVMSG <cible> msg  → Envoyer un message\r\n";
-				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- TOPIC #channel :txt  → Voir / modifier le topic\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- JOIN #channel         → Rejoindre un canal\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- PART #channel         → Quitter un canal\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- PRIVMSG <cible> msg   → Envoyer un message\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- TOPIC #channel :txt   → Voir / modifier le topic\r\n";
 				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- MODE #channel +o nick → Ajouter un opérateur\r\n";
 				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- INVITE nick #channel  → Inviter un utilisateur\r\n";
 				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- KICK #channel nick    → Éjecter un utilisateur\r\n";
 				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- WHO / WHOIS           → Infos sur les utilisateurs\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- DCC SEND nick /PATH   → Transferer des fichiers à l'utilisateur\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- DCC GET /PATH         → Accepter le transfert des fichiers reçu\r\n";
+				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !emote                → Affiche la liste d'emoji\r\n";
 				msgBot += ":bot!ircbot@localhost PRIVMSG " + target + " :- !help                 → Affiche cette aide\r\n";
 
+	std::string msgEmote = ":bot!ircbot@localhost PRIVMSG " + target + " :           📜 Emote list :\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 😀😁😂😃😄😅😆😇😈😉😊😋😌😍😎😏\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 😐😑😒😓😔😕😖😗😘😙😚😛😜😝😞😟\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 😠😡😢😣😤😥😦😧😨😩😪😫😬😭😮😯\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 😰😱😲😳😴😵😶😷😸😹😺😻😼😽😾😿\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 🙀🙁🙂🙃🙄🙅🙆🙇🙈🙉🙊🙋🙌🙍🙎🙏\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 🤐🤑🤒🤓🤤🤔🤕🤖🤗🤘🤙🤚🤛🤜🤝🤟\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 💐💑💒💓💔💕💖💗💘💙💚💛💜💝💞💟\r\n";
+				msgEmote += ":bot!ircbot@localhost PRIVMSG " + target + " : 💠💡💢💣💤💥💦💧💨💩💪💫💬💭💯🤨\r\n";
 	
 	// Envoi vers un channel
 	if (target[0] == '#') {
 		target.erase(0, 1);
-		if (_cTarget)
+		if (_cTarget && !BONUS)
 			_cTarget->sendAllClientInAChannel(msg, _sender);
 			
 		if (BONUS && _cTarget->getBotChannel()) {
-			if (_args.at(2) == "!help") {
-				std::cout << "BONUS: PING command received, sending PONG" << std::endl;
-				_cTarget->sendAllClientInAChannel(msgBot);
-			}
+			if (_args.at(2) == "!help")
+				_sender->appendToWriteBuffer(msgBot);
+			else if (_args.at(2) == "!emote")
+				_sender->appendToWriteBuffer(msgEmote);
 		}
 	}
 	
 	// Envoi vers un user
 	else {
-		if (_uTarget)
+		for(std::list<User *>::iterator it = _server->getUsersList().begin(); it != _server->getUsersList().end(); ++it) {
+			if ((*it)->getName() == target)
 			_uTarget->appendToWriteBuffer(msg);
+		}
 	}
 }
diff --git a/sources/core/main.cpp b/sources/core/main.cpp
index 8fd050b..be0642f 100644
--- a/sources/core/main.cpp
+++ b/sources/core/main.cpp
@@ -6,7 +6,7 @@
 /*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/13 11:03:13 by rparodi           #+#    #+#             */
-/*   Updated: 2025/06/23 14:38:53 by sben-tay         ###   ########.fr       */
+/*   Updated: 2025/06/24 00:47:18 by sben-tay         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -28,3 +28,4 @@ int main(int argc, char *argv[]) {
     server.start();
     return 0;
 }
+