diff --git a/commands/collage.py b/commands/collage.py
index e8a721e..a61b25d 100644
--- a/commands/collage.py
+++ b/commands/collage.py
@@ -8,76 +8,76 @@ import utils as u
 # from catbox_async_uploader.catbox_async_uploader.enums import LitterboxDuration
 # from pyzxz import ZeroXZero
 
-async def send_collage(bot: bot.Bot, ctx: nerimity.Context, entity: str, size: str = "3x3", timeframe: str = "7day", username: str = None):
-    temp_msg = None
+def setup(bot: bot.Bot):
+    async def send_collage(ctx: nerimity.Context, entity: str, size: str = "3x3", timeframe: str = "7day", username: str = None):
+        temp_msg = None
 
-    if 'x' not in size:
-        await ctx.send(u.error_msg(f"Please provide a valid size.\nie `/chart{entity} 5x5`"))
-        return
-
-    try:
-        if int(size.split('x')[0]) > 5 or int(size.split('x')[1]) > 5:
-            await ctx.send(u.error_msg("Maximum size allowed is 5x5."))
+        if 'x' not in size:
+            await ctx.send(u.error_msg(f"Please provide a valid size.\nie `/chart{entity} 5x5`"))
             return
 
-    except Exception:
-        await ctx.send(u.error_msg(f"Please provide a valid size.\nie `/chart{entity} 5x5`"))
-        return
-    
-    username = await bot.find_lastfm_username(ctx, username)
-    if not username: return
+        try:
+            if int(size.split('x')[0]) > 5 or int(size.split('x')[1]) > 5:
+                await ctx.send(u.error_msg("Maximum size allowed is 5x5."))
+                return
 
-    match timeframe:
-        case "a" | "all" | "alltime" | "o": timeframe = "overall"
-        case "y" | "year" | "yearly":       timeframe = "12month"
-        case "m" | "month" | "monthly":     timeframe = "1month"
-        case "w" | "week" | "weekly":       timeframe = "7day"
-        case "d" | "day" | "daily":         timeframe = "1day"
+        except Exception:
+            await ctx.send(u.error_msg(f"Please provide a valid size.\nie `/chart{entity} 5x5`"))
+            return
+        
+        username = await bot.find_lastfm_username(ctx, username)
+        if not username: return
 
-        case _: "7day"
+        match timeframe:
+            case "a" | "all" | "alltime" | "o": timeframe = "overall"
+            case "y" | "year" | "yearly":       timeframe = "12month"
+            case "m" | "month" | "monthly":     timeframe = "1month"
+            case "w" | "week" | "weekly":       timeframe = "7day"
+            case "d" | "day" | "daily":         timeframe = "1day"
 
-    if timeframe == "1day":
-        await ctx.send(u.error_msg("Daily charts are not yet supported. Sorry!!"))
-        return
+            case _: "7day"
 
-    try:
-        temp_msg = await ctx.send(f"Generating {entity} chart for **{username}**...")
+        if timeframe == "1day":
+            await ctx.send(u.error_msg("Daily charts are not yet supported. Sorry!!"))
+            return
 
-        image = bot.collage_generator.generate(
-            entity   = entity, 
-            username = username,
-            rows     = int(size.split(sep="x")[0]),
-            cols     = int(size.split(sep="x")[1]),
-            period   = timeframe
-        )
+        try:
+            temp_msg = await ctx.send(f"Generating {entity} chart for **{username}**...")
 
-        img_bytes = io.BytesIO()
-        image.save(fp=img_bytes, format="png")
+            image = bot.collage_generator.generate(
+                entity   = entity, 
+                username = username,
+                rows     = int(size.split(sep="x")[0]),
+                cols     = int(size.split(sep="x")[1]),
+                period   = timeframe
+            )
 
-        # link = await bot.catbox_uploader.upload_to_litterbox(
-        #     file_path_or_bytes = img_bytes,
-        #     file_name = "collage.png",
-        #     duration = LitterboxDuration.H12
-        # )
+            img_bytes = io.BytesIO()
+            image.save(fp=img_bytes, format="png")
 
-        # attachment = await u.construct_attachment_from_bytes(
-        #     filename = "chart",
-        #     file_type = "png",
-        #     bytes_arr = img_bytes,
-        # ).upload()
+            # link = await bot.catbox_uploader.upload_to_litterbox(
+            #     file_path_or_bytes = img_bytes,
+            #     file_name = "collage.png",
+            #     duration = LitterboxDuration.H12
+            # )
 
-        link = await bot.zxz.upload_from_bytes(img_bytes.getvalue(), f"{entity}_chart.png")
+            # attachment = await u.construct_attachment_from_bytes(
+            #     filename = "chart",
+            #     file_type = "png",
+            #     bytes_arr = img_bytes,
+            # ).upload()
 
-        await ctx.send(u.good_msg(f"**{size}** {timeframe} {entity} chart for [{username}](https://last.fm/user/{username}) successfully generated:\n{link}"))
+            link = await bot.zxz.upload_from_bytes(img_bytes.getvalue(), f"{entity}_chart.png")
 
-    except Exception as e:
-        print(e)
-        await ctx.send(u.error_msg(f"I crashed and burned while generating the chart:\n`{e}`"))
+            await ctx.send(u.good_msg(f"**{size}** {timeframe} {entity} chart for [{username}](https://last.fm/user/{username}) successfully generated:\n{link}"))
 
-    finally: 
-        if temp_msg: temp_msg.delete()
+        except Exception as e:
+            print(e)
+            await ctx.send(u.error_msg(f"I crashed and burned while generating the chart:\n`{e}`"))
+
+        finally: 
+            if temp_msg: temp_msg.delete()
 
-def setup(bot: bot.Bot):
     @bot.command(name="chart", aliases=["c", "chartalbum", "albumchart", "collage"])
     @bot.slash_command(name="chartalbum", description="Generate an album collage.")
     async def chartalbum(ctx: nerimity.Context, size: str = "3x3", timeframe: str = "7day", username: str = None):