diff --git a/commands/stop.js b/commands/stop.js
index 1301514..80b3e5b 100644
--- a/commands/stop.js
+++ b/commands/stop.js
@@ -1,19 +1,14 @@
-const emotes = require ("../config/emojis.json");
-const Discord = require("discord.js")
+const emotes = require("../config/emojis.json");
 
-exports.run = async (client, message, args) => {
+exports.run = async (client, message) => {
 
-    //If the member is not in a voice channel
-    if(!message.member.voice.channel) return message.channel.send(`You're not in a voice channel ${emotes.error}`);
+    if (!message.member.voice.channel) return message.channel.send(`You're not in a voice channel ${emotes.error}`);
 
-    //If there's no music
-    if(!client.player.isPlaying(message.guild.id)) return message.channel.send(`No music playing on this server ${emotes.error}`);
+    if (!client.player.getQueue(message)) return message.channel.send(`No music playing on this server ${emotes.error}`);
 
-    //Stop player
-    client.player.setRepeatMode(message.guild.id, false);
-    client.player.stop(message.guild.id);
+    client.player.setRepeatMode(message, false);
+    client.player.stop(message);
 
-    //Message
-    message.channel.send(`Music stopped ${emotes.success}`);
+    message.channel.send(`Music stopped into this server ${emotes.success}`);
 
-}
+};