diff --git a/main.js b/main.js
index b0ce053..dc34918 100644
--- a/main.js
+++ b/main.js
@@ -16,7 +16,6 @@ client.once('ready', () => {
 });
 
 client.on('message', message => {
-    const args = message.content.split(' ');
 
     let msg = message.content.toLowerCase();
 
@@ -85,7 +84,7 @@ client.on('message', message => {
     else if (msg.startsWith("tylko jedno")) {
         message.channel.send("Koksu pięć gram odlecieć sam");
     }
-    if (msg.startsWith("hug")) {
+    if (msg.startsWith("hug") && msgContentSplit.length < 3) {
         var mentionedUsers = message.mentions.users.values()
         var mentionedUsersSize = message.mentions.users.size
         var mentionedRoles = message.mentions.roles.values()
@@ -115,6 +114,14 @@ client.on('message', message => {
             embed = createEmbed(title, hugGifs[randomNum], "@everyone")
             message.channel.send(embed)
         }
+        else if (msg.includes("all")){
+            embed = createEmbed(title, hugGifs[randomNum], "@here")
+            message.channel.send(embed)
+        }
+        else {
+            embed = new Discord.MessageEmbed().setImage(hugGifs[randomNum]).setColor(randomColor())
+            message.channel.send(embed)
+        }
     }
 });