diff --git a/main.js b/main.js
index c7579ad..1ab2b49 100644
--- a/main.js
+++ b/main.js
@@ -2,9 +2,17 @@ const Discord = require('discord.js');
 const client = new Discord.Client();
 var replyChannelId;
 var mentionedChannelId;
+var hugGifs =
+        ["https://c.tenor.com/9e1aE_xBLCsAAAAC/anime-hug.gif",
+         "https://c.tenor.com/Ct4bdr2ZGeAAAAAC/teria-wang-kishuku-gakkou-no-juliet.gif",
+         "https://c.tenor.com/ztEJgrjFe54AAAAd/hug-anime.gif",
+         "https://c.tenor.com/UhcyGsGpLNIAAAAd/hug-anime.gif",
+         "https://c.tenor.com/fLxZt7jo1YEAAAAd/loli-dragon.gif",
+         "https://c.tenor.com/qF7mO4nnL0sAAAAd/abra%C3%A7o-hug.gif"]
+
 
 client.once('ready', () => {
-    console.log('Im online!');
+    console.log('Running');
 });
 
 client.on('message', message => {
@@ -24,9 +32,9 @@ client.on('message', message => {
     } 
 }
 
-    var msgContent = message.content;
+    var msgContent = message.content
 
-    var msgContentSplit = msgContent.split(" ");
+    var msgContentSplit = msgContent.split(/[ ]+/);
 
     if(message.reference != null){
 
@@ -66,17 +74,56 @@ client.on('message', message => {
 
     if (msg.startsWith("henlo") && message.author.bot == false) {
         var emojis = ["🥰", "🐄", "🐮", "❤️", "👋", "🤠", "😊"];
-        let randomNum = Math.floor(Math.random() * 7);
+        let randomNum = RNG(emojis.length);
         message.channel.send("Henlooo " + message.author.username + "   " + emojis[randomNum]);
     }
     else if (msg.startsWith("how ye") && message.author.bot === false) {
-        let randomNum = Math.floor(Math.random() * 5);
         var responses = ["Not bad, how yee?", "MOOdy", "A bit sad 😢", "Good, how yee?", "I'm fine, how yee?"];
+        let randomNum = RNG(responses.length);
         message.channel.send(responses[randomNum]);
     }
     else if (msg.startsWith("tylko jedno")) {
         message.channel.send("Koksu pięć gram odlecieć sam");
     }
+    if (msg.startsWith("hug")) {
+        var mentionedUsers = message.mentions.users.values()
+        var mentionedUsersSize = message.mentions.users.size
+        var mentionedRoles = message.mentions.roles.values()
+        var mentionedRolesSize = message.mentions.roles.size
+
+        if (mentionedRolesSize > 0 || mentionedRolesSize > 0){
+            let randomNum = RNG(hugGifs.length)
+            let allMentions = ""
+            for (let i = 0; i < mentionedUsersSize; i++) {
+                let user = mentionedUsers.next()
+                allMentions = allMentions + ", <@" + user.value.id + ">"
+            }
+            for (let i = 0; i < mentionedRolesSize; i++) {
+                let role = mentionedRoles.next()
+                allMentions = allMentions + ", <@&" + role.value.id + ">"
+            }
+            mess = new Discord.MessageEmbed()
+            .setTitle(message.author.username + " hugs")
+            .setImage(hugGifs[randomNum])
+            .setDescription(allMentions)
+            .setColor(randomColor())
+            message.channel.send(mess)
+        }
+    }
 });
 
+function randomColor() {
+    let color = '#';
+    for (let i = 0; i < 6; i++){
+       const random = Math.random();
+       const bit = (random * 16) | 0;
+       color += (bit).toString(16);
+    };
+    return color;
+ };
+
+function RNG(max){
+    return Math.floor(Math.random() * max)
+}
+
 client.login(process.env.token);