diff --git a/main.py b/main.py
index 06156fe..2609d1e 100644
--- a/main.py
+++ b/main.py
@@ -27,9 +27,8 @@ intents = discord.Intents().all()
 client = discord.Client(intents=intents)
 bot = commands.Bot(command_prefix="!p ", intents=intents)
 
+# YT related code
 youtubeUrlRegex = "https?:\/\/(www\.)?(youtu|youtube)\.(com|be)"
-
-
 def is_a_youtube_url(url: str):
     return bool(re.match(youtubeUrlRegex, url))
 
@@ -82,24 +81,29 @@ async def play(ctx, url: str):
     await ctx.send(embed=embedPlaying)
 
 
-@bot.command()
+@bot.command(name="join",help="Pour demander au bot de rejoindre le canal vocal")
 async def join(ctx):
-    channel = ctx.author.voice.channel
-    if channel:
-        print(f"Voice : connecting to {channel.id}")
-        bot.voice_channel = await channel.connect()
+    #print(f"Asked to join {channel.id}")
+    if not ctx.message.author.voice:
         embedMessage = discord.Embed(
-            title="PolaroBot connected", description=f"PolaroBot has connected to {ctx.author}'s channel")
+            title="🤖PolaroBot ne peut pas se connecter", description=f"T'es dans canal vocal ?")
     else:
+        channel = ctx.author.voice.channel
+        await channel.connect()
         embedMessage = discord.Embed(
-            title="PolaroBot can't connect", description=f"Are you connected to a voice channel ?")
+            title="🤖PolaroBot connecté", description=f"PolaroBot connecté au canal de {ctx.author}")
     await ctx.send(embed=embedMessage)
 
-
-@bot.command()
+@bot.command(name="leave", help="Pour faire quitter le canal vocal au bot")
 async def leave(ctx):
-    print(f"Voice : leaving {bot.voice_channel.id}")
-    await ctx.voice_client.disconnect()
+    voice_client = ctx.message.guild.voice_client
+    if voice_client and voice_client.is_connected():
+        embedMessage = discord.Embed(title="🤖PolaroBot se barre", description="Salut mon srab, je m'envole vers d'autres cieux")
+        await voice_client.disconnect()
+    else:
+        embedMessage = discord.Embed(title="🤖PolaroBot n'est pas connecté", description="""Ben déso gros mais je suis pas là...
+        Faut consulter si tu me vois partout....""")
+    await ctx.send(embed=embedMessage)
 
 
 @bot.event