diff --git a/commands/admin/add.js b/commands/admin/add.js
new file mode 100644
index 000000000..25284a135
--- /dev/null
+++ b/commands/admin/add.js
@@ -0,0 +1,94 @@
+module.exports = {
+    name: 'add',
+    aliases: ['adduser'],
+    desc: 'Add a member to the group',
+    category: 'Admin',
+
+    groupOnly: true,
+    adminOnly: true,
+    botAdminNeeded: true,
+
+    reactions: {
+        start: '➕',
+        success: '✅'
+    },
+
+    execute: async (sock, msg, args, {
+        from,
+        reply,
+        react
+    }) => {
+        try {
+            await react('➕');
+
+            let jid;
+
+            // Reply target
+            if (msg.quoted?.sender) {
+                jid = msg.quoted.sender;
+            }
+
+            // Mention target
+            if (!jid && msg.mentionedJid?.length) {
+                jid = msg.mentionedJid[0];
+            }
+
+            // Number from args
+            if (!jid && args.length) {
+                let number = args[0].replace(/\D/g, '');
+
+                if (number.startsWith('0')) {
+                    number = '27' + number.slice(1);
+                }
+
+                if (number.length < 8) {
+                    return reply('❌ Invalid phone number.');
+                }
+
+                jid = `${number}@s.whatsapp.net`;
+            }
+
+            if (!jid) {
+                return reply(
+                    'Usage:\n' +
+                    '• .add @user\n' +
+                    '• .add 27712345678\n' +
+                    '• Reply to someone with .add'
+                );
+            }
+
+            const result = await sock.groupParticipantsUpdate(
+                from,
+                [jid],
+                'add'
+            );
+
+            const status = Number(result?.[0]?.status);
+
+            switch (status) {
+                case 200:
+                    await react('✅');
+                    return reply('✅ Member added successfully.');
+
+                case 403:
+                    return reply("❌ Can't add this user because of their privacy settings.");
+
+                case 404:
+                    return reply('❌ User is not registered on WhatsApp.');
+
+                case 408:
+                    return reply('❌ Invite expired or timed out.');
+
+                case 409:
+                    return reply('ℹ️ User is already in the group.');
+
+                default:
+                    return reply(`❌ Failed to add user.\nStatus: ${status || 'Unknown'}`);
+            }
+
+        } catch (err) {
+            console.error(err);
+            reply(`❌ ${err.message}`);
+        }
+    }
+};
diff --git a/commands/admin/poll.js b/commands/admin/poll.js
new file mode 100644
index 000000000..88c82be00
--- /dev/null
+++ b/commands/admin/poll.js
@@ -0,0 +1,100 @@
+/**
+ * Poll Command - Create a poll in a group chat
+ */
+
+const config = require('../../config');
+
+// ===================================================
+// UTILITIES
+// ===================================================
+
+/**
+ * Creates a decorative header for the command response.
+ * @param {string} title - The title of the section.
+ * @returns {string} - The formatted header string.
+ */
+const createHeader = (title) => {
+    return `*[ ${title.toUpperCase()} ]*`;
+};
+
+/**
+ * Creates a separator line.
+ * @returns {string}
+ */
+const createSeparator = () => "──────────────";
+
+// ===================================================
+// MAIN COMMAND DEFINITION
+// ===================================================
+
+module.exports = {
+    name: 'poll',
+    aliases: ['createpoll', 'vote'],
+    category: 'admin',
+    adminOnly: true,
+    description: 'Create a poll with a question and options',
+    usage: '.poll Question | Option 1 | Option 2 | Option 3',
+
+    async execute(sock, msg, args, extra) {
+        try {
+            // Check if it's a group chat (polls are typically used in groups)
+            if (!extra.from.endsWith('@g.us')) {
+                await sock.sendMessage(
+                    extra.from,
+                    { text: '❌ This command can only be used inside groups!' },
+                    { quoted: msg }
+                );
+                return;
+            }
+
+            // Combine all arguments and split by the pipe symbol `|`
+            const input = args.join(' ');
+            const parts = input.split('|').map(part => part.trim());
+
+            const question = parts[0];
+            const options = parts.slice(1);
+
+            // Validate question and options (at least 2 options required for a valid poll)
+            if (!question || options.length < 2) {
+                let text = '';
+                text += createHeader('Poll Usage Error') + '\n\n';
+                text += `❌ Please provide a question and at least 2 options separated by pipes (\`|\`).\n\n`;
+                text += `*Example:*\n`;
+                text += `${config.prefix}poll What should we play? | PUBG | COD Mobile | Free Fire\n\n`;
+                text += createSeparator() + '\n';
+                text += `💡 Make sure to use \`|\` between options!`;
+
+                await sock.sendMessage(
+                    extra.from,
+                    { text, mentions: [extra.sender] },
+                    { quoted: msg }
+                );
+                return;
+            }
+
+            // Baileys poll creation payload
+            // selectableCount: 1 allows single voting, set to higher if multi-choice is needed
+            await sock.sendMessage(
+                extra.from,
+                {
+                    poll: {
+                        name: question,
+                        values: options,
+                        selectableCount: 1
+                    }
+                },
+                { quoted: msg }
+            );
+
+        } catch (err) {
+            console.error(err);
+            await sock.sendMessage(
+                extra.from,
+                {
+                    text: `❌ ${err.message}`
+                },
+                { quoted: msg }
+            );
+        }
+    }
+};
diff --git a/commands/admin/revoke.js b/commands/admin/revoke.js
new file mode 100644
index 000000000..65889c791
--- /dev/null
+++ b/commands/admin/revoke.js
@@ -0,0 +1,33 @@
+module.exports = {
+    name: 'revokelink',
+    aliases: ['resetlink', 'revokeinvite', 'rvk'],
+    category: 'admin',
+    description: 'Revoke the current group invite link',
+    usage: 'revokelink',
+    groupOnly: true,
+    adminOnly: true,
+    reactions: {
+        start: '🔄',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            const groupId = msg.key.remoteJid;
+
+            await sock.groupRevokeInvite(groupId);
+
+            const newCode = await sock.groupInviteCode(groupId);
+            const newLink = `https://chat.whatsapp.com/${newCode}`;
+
+            return reply(
+                `✅ *Group invite link has been revoked!*\n\n` +
+                `🔗 *New Invite Link:*\n${newLink}`
+            );
+        } catch (err) {
+            console.error(err);
+            return reply('❌ Failed to revoke the group invite link.');
+        }
+    }
+};
diff --git a/commands/admin/setgcname.js b/commands/admin/setgcname.js
new file mode 100644
index 000000000..1ae5eb742
--- /dev/null
+++ b/commands/admin/setgcname.js
@@ -0,0 +1,37 @@
+module.exports = {
+    name: 'setgroupname',
+    aliases: ['setname', 'groupname', 'subject'],
+    category: 'admin',
+    description: 'Change the group name',
+    usage: 'setgroupname <new name>',
+    groupOnly: true,
+    adminOnly: true,
+    reactions: {
+        start: '✏️',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            if (!args.length) {
+                return reply(
+                    `❌ Please provide a new group name.\n\nExample:\n.setgroupname My Awesome Group`
+                );
+            }
+
+            const newName = args.join(' ').trim();
+
+            if (newName.length > 100) {
+                return reply('❌ Group name cannot be longer than 100 characters.');
+            }
+
+            await sock.groupUpdateSubject(msg.key.remoteJid, newName);
+
+            return reply(`✅ Group name has been changed to:\n*${newName}*`);
+        } catch (err) {
+            console.error(err);
+            return reply('❌ Failed to change the group name.');
+        }
+    }
+};
diff --git a/commands/admin/setgcpp.js b/commands/admin/setgcpp.js
new file mode 100644
index 000000000..be8e1ffff
--- /dev/null
+++ b/commands/admin/setgcpp.js
@@ -0,0 +1,114 @@
+/**
+ * Set Group Icon / Profile Command - Change the group's profile picture
+ */
+
+const fs = require('fs');
+const path = require('path');
+const config = require('../../config');
+
+// ===================================================
+// UTILITIES
+// ===================================================
+
+/**
+ * Creates a decorative header for the command response.
+ * @param {string} title - The title of the section.
+ * @returns {string} - The formatted header string.
+ */
+const createHeader = (title) => {
+    return `*[ ${title.toUpperCase()} ]*`;
+};
+
+/**
+ * Creates a separator line.
+ * @returns {string}
+ */
+const createSeparator = () => "──────────────";
+
+// ===================================================
+// MAIN COMMAND DEFINITION
+// ===================================================
+
+module.exports = {
+    name: 'setgpp',
+    aliases: ['gp', 'gcpp'],
+    category: 'admin',
+    description: 'Change the group profile picture',
+    usage: '.setgpp (reply to an image or attach one)',
+
+    async execute(sock, msg, args, extra) {
+        try {
+            // Check if it's a group chat
+            if (!extra.from.endsWith('@g.us')) {
+                await sock.sendMessage(
+                    extra.from,
+                    { text: '❌ This command can only be used inside groups!' },
+                    { quoted: msg }
+                );
+                return;
+            }
+
+            // Check if sender is admin or bot has admin rights (optional check depending on your bot framework, but good practice)
+            // Here we look for quoted media or media attached directly to the message
+            const quotedMsg = msg.message?.extendedTextMessage?.contextInfo?.quotedMessage;
+            const isQuotedImage = quotedMsg?.imageMessage;
+            const isDirectImage = msg.message?.imageMessage;
+
+            if (!isDirectImage && !isQuotedImage) {
+                let text = '';
+                text += createHeader('Group Profile Error') + '\n\n';
+                text += `❌ Please send or reply to an image with the command ${config.prefix}setgpp.\n\n`;
+                text += createSeparator() + '\n';
+                text += `💡 Attach an image or reply to one to update the group icon.`;
+
+                await sock.sendMessage(
+                    extra.from,
+                    { text, mentions: [extra.sender] },
+                    { quoted: msg }
+                );
+                return;
+            }
+
+            // Inform user that processing has started
+            await sock.sendMessage(
+                extra.from,
+                { text: '🔄 Updating group profile picture...' },
+                { quoted: msg }
+            );
+
+            // Download media (handles both direct media or quoted media)
+            // Note: Depending on your baileys wrapper helper, you can use downloadMediaMessage or downloadContentFromMessage. 
+            // Using standard Baileys download approach:
+            const mediaMessage = isDirectImage ? msg.message : quotedMsg;
+            
+            // If your framework has a dedicated media downloader utility, use it here. 
+            // Below is the standard Baileys method block for updating group icon:
+            const { downloadMediaMessage } = require('@whiskeysockets/baileys');
+            const buffer = await downloadMediaMessage(
+                { message: mediaMessage },
+                'buffer',
+                {},
+                { logger: console }
+            );
+
+            // Update group profile picture using Baileys socket method
+            await sock.updateProfilePicture(extra.from, buffer);
+
+            await sock.sendMessage(
+                extra.from,
+                { text: '✅ Successfully updated the group profile picture!' },
+                { quoted: msg }
+            );
+
+        } catch (err) {
+            console.error(err);
+            await sock.sendMessage(
+                extra.from,
+                {
+                    text: `❌ Failed to update group picture: ${err.message}`
+                },
+                { quoted: msg }
+            );
+        }
+    }
+};
diff --git a/commands/admin/tagadmins.js b/commands/admin/tagadmins.js
new file mode 100644
index 000000000..f60b45cd4
--- /dev/null
+++ b/commands/admin/tagadmins.js
@@ -0,0 +1,51 @@
+module.exports = {
+    name: 'admins',
+    aliases: ['admin', 'tagadmin', 'tagadmins', 'staff'],
+    category: 'admin',
+    description: 'Mention all group admins',
+    usage: 'admins [optional message]',
+    groupOnly: true,
+    reactions: {
+        start: '📢',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            const groupId = msg.key.remoteJid;
+            const metadata = await sock.groupMetadata(groupId);
+
+            const admins = metadata.participants.filter(
+                p => p.admin === 'admin' || p.admin === 'superadmin'
+            );
+
+            if (!admins.length) {
+                return reply('❌ No admins found.');
+            }
+
+            const mentions = admins.map(a => a.id);
+
+            let text = `👑 *Group Admins (${admins.length})*\n\n`;
+
+            admins.forEach((admin, i) => {
+                text += `${i + 1}. @${admin.id.split('@')[0]}\n`;
+            });
+
+            if (args.length) {
+                text += `\n📩 *Message:*\n${args.join(' ')}`;
+            }
+
+            await sock.sendMessage(groupId, {
+                text,
+                mentions
+            }, {
+                quoted: msg
+            });
+
+        } catch (err) {
+            console.error(err);
+            reply('❌ Failed to mention group admins.');
+        }
+    }
+};
diff --git a/commands/ai/ai.js b/commands/ai/ai.js
deleted file mode 100644
index 3c8e12739..000000000
--- a/commands/ai/ai.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * AI Chat Command - ChatGPT-style responses
- */
-
-const APIs = require('../../utils/api');
-
-module.exports = {
-  name: 'ai',
-  aliases: ['gpt', 'chatgpt', 'ask'],
-  category: 'ai',
-  description: 'Chat with AI (ChatGPT-style)',
-  usage: '.ai <question>',
-  
-  async execute(sock, msg, args, extra) {
-    try {
-      if (args.length === 0) {
-        return extra.reply('❌ Usage: .ai <question>\n\nExample: .ai What is the capital of France?');
-      }
-      
-      const question = args.join(' ');
-      
-      const response = await APIs.chatAI(question);
-      
-      // Send only the answer without labels
-      const answer = response.response || response.msg || response.data?.msg || response;
-      await extra.reply(answer);
-      
-    } catch (error) {
-      await extra.reply(`❌ AI Error: ${error.message}`);
-    }
-  }
-};
diff --git a/commands/anime/hneko.js b/commands/anime/hneko.js
deleted file mode 100644
index 4b3947686..000000000
--- a/commands/anime/hneko.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Hneko Command - Get random hneko anime images
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/hneko';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'hneko',
-  aliases: ['hnekonsfw'],
-  category: 'anime',
-  desc: 'Get random hneko NSFW anime images',
-  usage: 'hneko',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
-      }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
-      }
-      
-      const imageResponse = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'image/*'
-        },
-        timeout: 30000
-      });
-      
-      const imageBuffer = Buffer.from(imageResponse.data);
-      
-      if (!imageBuffer || imageBuffer.length === 0) {
-        throw new Error('Empty image response');
-      }
-      
-      const maxImageSize = 5 * 1024 * 1024;
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `hneko_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
-      try {
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
-      } finally {
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-        }
-      }
-      
-    } catch (error) {
-      console.error('Error in hneko command:', error);
-      
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch hneko image: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/hwaifu.js b/commands/anime/hwaifu.js
deleted file mode 100644
index fee89125a..000000000
--- a/commands/anime/hwaifu.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Hwaifu Command - Get random hwaifu anime images
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/hwaifu';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'hwaifu',
-  aliases: ['hwaifunsfw'],
-  category: 'anime',
-  desc: 'Get random hwaifu NSFW anime images',
-  usage: 'hwaifu',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
-      }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
-      }
-      
-      const imageResponse = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'image/*'
-        },
-        timeout: 30000
-      });
-      
-      const imageBuffer = Buffer.from(imageResponse.data);
-      
-      if (!imageBuffer || imageBuffer.length === 0) {
-        throw new Error('Empty image response');
-      }
-      
-      const maxImageSize = 5 * 1024 * 1024;
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `hwaifu_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
-      try {
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
-      } finally {
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-        }
-      }
-      
-    } catch (error) {
-      console.error('Error in hwaifu command:', error);
-      
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch hwaifu image: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/konachan.js b/commands/anime/konachan.js
deleted file mode 100644
index 230ec89d8..000000000
--- a/commands/anime/konachan.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * Konachan Command - Get random konachan anime images
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/konachan';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'konachan',
-  aliases: ['konachansfw'],
-  category: 'anime',
-  desc: 'Get random konachan SFW anime images',
-  usage: 'konachan',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      // Fetch JSON from API to get image URL
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      // Extract image URL from response
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
-      }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
-      }
-      
-      // Download image from the URL
-      const imageResponse = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'image/*'
-        },
-        timeout: 30000
-      });
-      
-      const imageBuffer = Buffer.from(imageResponse.data);
-      
-      // Verify buffer is valid
-      if (!imageBuffer || imageBuffer.length === 0) {
-        throw new Error('Empty image response');
-      }
-      
-      // Check file size (WhatsApp image limit is 5MB)
-      const maxImageSize = 5 * 1024 * 1024; // 5MB
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      // Determine file extension from URL or content type
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      // Write to temp file first, then read back to ensure buffer is valid
-      const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `konachan_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
-      try {
-        // Write buffer to temp file
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        
-        // Read back from file to ensure buffer is properly formed
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        // Send the image
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
-      } finally {
-        // Cleanup temp file
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-          // Ignore cleanup errors
-        }
-      }
-      
-    } catch (error) {
-      console.error('Error in konachan command:', error);
-      
-      // Handle specific error cases
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch konachan image: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/loli.js b/commands/anime/loli.js
index fedaca770..91445d54c 100644
--- a/commands/anime/loli.js
+++ b/commands/anime/loli.js
@@ -13,7 +13,7 @@ const API_KEY = 'prince';
 module.exports = {
   name: 'loli',
   aliases: ['lolinsfw'],
-  category: 'anime',
+  category: 'nsfw',
   desc: 'Get random loli NSFW anime images',
   usage: 'loli',
   execute: async (sock, msg, args, extra) => {
diff --git a/commands/anime/megumin.js b/commands/anime/megumin.js
deleted file mode 100644
index f73609f08..000000000
--- a/commands/anime/megumin.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Megumin Command - Get random megumin anime images
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/megumin';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'megumin',
-  aliases: ['meguminnsfw'],
-  category: 'anime',
-  desc: 'Get random megumin NSFW anime images',
-  usage: 'megumin',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
-      }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
-      }
-      
-      const imageResponse = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'image/*'
-        },
-        timeout: 30000
-      });
-      
-      const imageBuffer = Buffer.from(imageResponse.data);
-      
-      if (!imageBuffer || imageBuffer.length === 0) {
-        throw new Error('Empty image response');
-      }
-      
-      const maxImageSize = 5 * 1024 * 1024;
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `megumin_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
-      try {
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
-      } finally {
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-        }
-      }
-      
-    } catch (error) {
-      console.error('Error in megumin command:', error);
-      
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch megumin image: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/milf.js b/commands/anime/milf.js
deleted file mode 100644
index d2652aad1..000000000
--- a/commands/anime/milf.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * Milf Command - Get random milf anime images
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/milf';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'milf',
-  aliases: ['milfnsfw'],
-  category: 'anime',
-  desc: 'Get random milf NSFW anime images',
-  usage: 'milf',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
-      }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
-      }
-      
-      const imageResponse = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'image/*'
-        },
-        timeout: 30000
-      });
-      
-      const imageBuffer = Buffer.from(imageResponse.data);
-      
-      if (!imageBuffer || imageBuffer.length === 0) {
-        throw new Error('Empty image response');
-      }
-      
-      const maxImageSize = 5 * 1024 * 1024;
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `milf_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
-      try {
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
-      } finally {
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-        }
-      }
-      
-    } catch (error) {
-      console.error('Error in milf command:', error);
-      
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch milf image: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/neko.js b/commands/anime/neko.js
index ba9a3bebc..cae1e841d 100644
--- a/commands/anime/neko.js
+++ b/commands/anime/neko.js
@@ -1,45 +1,38 @@
-/**
- * Neko Command - Get random neko anime images
- */
-
 const axios = require('axios');
 const fs = require('fs');
 const path = require('path');
 const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
 
-const BASE = 'https://api.princetechn.com/api/anime/neko';
-const API_KEY = 'prince';
+const BASE = 'https://api.nekosapi.com/v4/images/random';
 
 module.exports = {
   name: 'neko',
-  aliases: ['nekosfw'],
-  category: 'anime',
-  desc: 'Get random neko SFW anime images',
+  aliases: ['catgirl', 'waifu'],
+  category: 'nsfw',
+  desc: 'Get a random neko image',
   usage: 'neko',
+
   execute: async (sock, msg, args, extra) => {
     try {
-      // Fetch JSON from API to get image URL
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
+      const { data } = await axios.get(BASE, {
         headers: {
           'User-Agent': 'Mozilla/5.0',
           'Accept': 'application/json'
         },
         timeout: 30000
       });
-      
-      // Extract image URL from response
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
+
+      if (!Array.isArray(data) || data.length === 0) {
+        throw new Error('No images returned from the API');
       }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
+
+      const image = data[0];
+      const imageUrl = image.url;
+
+      if (!imageUrl) {
+        throw new Error('Invalid image URL');
       }
-      
-      // Download image from the URL
+
       const imageResponse = await axios.get(imageUrl, {
         responseType: 'arraybuffer',
         headers: {
@@ -48,78 +41,49 @@ module.exports = {
         },
         timeout: 30000
       });
-      
+
       const imageBuffer = Buffer.from(imageResponse.data);
-      
-      // Verify buffer is valid
-      if (!imageBuffer || imageBuffer.length === 0) {
+
+      if (!imageBuffer.length) {
         throw new Error('Empty image response');
       }
-      
-      // Check file size (WhatsApp image limit is 5MB)
-      const maxImageSize = 5 * 1024 * 1024; // 5MB
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      // Determine file extension from URL or content type
+
       const contentType = imageResponse.headers['content-type'] || '';
       let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      // Write to temp file first, then read back to ensure buffer is valid
+
+      if (contentType.includes('png')) extension = 'png';
+      else if (contentType.includes('webp')) extension = 'webp';
+      else if (contentType.includes('jpeg')) extension = 'jpg';
+
       const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `neko_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
+      const tempPath = path.join(tempDir, `neko_${Date.now()}.${extension}`);
+
       try {
-        // Write buffer to temp file
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        
-        // Read back from file to ensure buffer is properly formed
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        // Send the image
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
+        fs.writeFileSync(tempPath, imageBuffer);
+
+        await sock.sendMessage(
+          extra.from,
+          {
+            image: fs.readFileSync(tempPath)
+          },
+          { quoted: msg }
+        );
       } finally {
-        // Cleanup temp file
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-          // Ignore cleanup errors
-        }
+        deleteTempFile(tempPath);
       }
-      
+
     } catch (error) {
       console.error('Error in neko command:', error);
-      
-      // Handle specific error cases
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch neko image: ${error.message}`);
+
+      if (error.response?.status === 429) {
+        return extra.reply('❌ Rate limit exceeded. Please try again later.');
+      }
+
+      if (error.code === 'ECONNABORTED') {
+        return extra.reply('❌ Request timed out. Please try again.');
       }
+
+      return extra.reply(`❌ Failed to fetch image: ${error.message}`);
     }
   }
 };
-
diff --git a/commands/anime/random.js b/commands/anime/random.js
deleted file mode 100644
index c9214c5c6..000000000
--- a/commands/anime/random.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Random Command - Get random anime data
- */
-
-const axios = require('axios');
-const fs = require('fs');
-const path = require('path');
-const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
-
-const BASE = 'https://api.princetechn.com/api/anime/random';
-const API_KEY = 'prince';
-
-module.exports = {
-  name: 'random',
-  aliases: ['animerandom', 'randomanime'],
-  category: 'anime',
-  desc: 'Get random anime data',
-  usage: 'random',
-  execute: async (sock, msg, args, extra) => {
-    try {
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
-        headers: {
-          'User-Agent': 'Mozilla/5.0',
-          'Accept': 'application/json'
-        },
-        timeout: 30000
-      });
-      
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing anime data');
-      }
-      
-      const animeData = response.data.result;
-      
-      // Download thumbnail image
-      let imageBuffer = null;
-      if (animeData.thumbnail) {
-        try {
-          const imageResponse = await axios.get(animeData.thumbnail, {
-            responseType: 'arraybuffer',
-            headers: {
-              'User-Agent': 'Mozilla/5.0',
-              'Accept': 'image/*'
-            },
-            timeout: 30000
-          });
-          
-          imageBuffer = Buffer.from(imageResponse.data);
-          
-          if (imageBuffer && imageBuffer.length > 0) {
-            const maxImageSize = 5 * 1024 * 1024;
-            if (imageBuffer.length > maxImageSize) {
-              imageBuffer = null; // Skip image if too large
-            }
-          }
-        } catch (imgError) {
-          console.error('Error downloading thumbnail:', imgError);
-          imageBuffer = null;
-        }
-      }
-      
-      // Build caption with anime info
-      let caption = `*${animeData.title || 'Unknown'}*\n\n`;
-      
-      if (animeData.episodes) {
-        caption += `📺 Episodes: ${animeData.episodes}\n`;
-      }
-      
-      if (animeData.status) {
-        caption += `📊 Status: ${animeData.status}\n`;
-      }
-      
-      if (animeData.synopsis) {
-        caption += `\n📝 ${animeData.synopsis}\n`;
-      }
-      
-      if (animeData.link) {
-        caption += `\n🔗 ${animeData.link}`;
-      }
-      
-      // Send with image if available
-      if (imageBuffer) {
-        const contentType = 'image/jpeg';
-        let extension = 'jpg';
-        if (animeData.thumbnail.match(/\.(png|jpg|jpeg)$/i)) {
-          const match = animeData.thumbnail.match(/\.(png|jpg|jpeg)$/i);
-          extension = match[1].toLowerCase();
-        }
-        
-        const tempDir = getTempDir();
-        const timestamp = Date.now();
-        const tempImagePath = path.join(tempDir, `anime_${timestamp}.${extension}`);
-        
-        try {
-          fs.writeFileSync(tempImagePath, imageBuffer);
-          const finalBuffer = fs.readFileSync(tempImagePath);
-          
-          await sock.sendMessage(extra.from, {
-            image: finalBuffer,
-            caption: caption
-          }, { quoted: msg });
-          
-        } finally {
-          try {
-            deleteTempFile(tempImagePath);
-          } catch (cleanupError) {
-          }
-        }
-      } else {
-        // Send text only if no image
-        await sock.sendMessage(extra.from, {
-          text: caption
-        }, { quoted: msg });
-      }
-      
-    } catch (error) {
-      console.error('Error in random command:', error);
-      
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Anime data not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch anime data: ${error.message}`);
-      }
-    }
-  }
-};
-
diff --git a/commands/anime/waifu.js b/commands/anime/waifu.js
index 86a8e860c..76724e8a7 100644
--- a/commands/anime/waifu.js
+++ b/commands/anime/waifu.js
@@ -1,45 +1,37 @@
-/**
- * Waifu Command - Get random waifu anime images
- */
-
 const axios = require('axios');
 const fs = require('fs');
 const path = require('path');
 const { getTempDir, deleteTempFile } = require('../../utils/tempManager');
 
-const BASE = 'https://api.princetechn.com/api/anime/waifu';
-const API_KEY = 'prince';
-
+const BASE = 'https://api.waifu.im/images?IsNsfw=True';
 module.exports = {
   name: 'waifu',
-  aliases: ['waifusfw'],
-  category: 'anime',
-  desc: 'Get random waifu SFW anime images',
+  aliases: ['waifuim'],
+  category: 'nsfw',
+  desc: 'Get a random waifu image',
   usage: 'waifu',
+
   execute: async (sock, msg, args, extra) => {
     try {
-      // Fetch JSON from API to get image URL
-      const url = `${BASE}?apikey=${API_KEY}`;
-      const response = await axios.get(url, {
+      const { data } = await axios.get(BASE, {
         headers: {
           'User-Agent': 'Mozilla/5.0',
           'Accept': 'application/json'
         },
         timeout: 30000
       });
-      
-      // Extract image URL from response
-      if (!response.data || !response.data.result) {
-        throw new Error('Invalid API response: missing image URL');
+
+      if (!data?.items?.length) {
+        throw new Error('No images returned from the API');
       }
-      
-      const imageUrl = response.data.result;
-      
-      if (!imageUrl || typeof imageUrl !== 'string') {
-        throw new Error('Invalid image URL in API response');
+
+      const image = data.items[0];
+      const imageUrl = image.url;
+
+      if (!imageUrl) {
+        throw new Error('Image URL not found');
       }
-      
-      // Download image from the URL
+
       const imageResponse = await axios.get(imageUrl, {
         responseType: 'arraybuffer',
         headers: {
@@ -48,78 +40,55 @@ module.exports = {
         },
         timeout: 30000
       });
-      
+
       const imageBuffer = Buffer.from(imageResponse.data);
-      
-      // Verify buffer is valid
-      if (!imageBuffer || imageBuffer.length === 0) {
+
+      if (!imageBuffer.length) {
         throw new Error('Empty image response');
       }
-      
-      // Check file size (WhatsApp image limit is 5MB)
-      const maxImageSize = 5 * 1024 * 1024; // 5MB
-      if (imageBuffer.length > maxImageSize) {
-        throw new Error(`Image too large: ${(imageBuffer.length / 1024 / 1024).toFixed(2)}MB (max 5MB)`);
-      }
-      
-      // Determine file extension from URL or content type
-      const contentType = imageResponse.headers['content-type'] || '';
-      let extension = 'jpg';
-      if (contentType.includes('png')) {
-        extension = 'png';
-      } else if (contentType.includes('jpeg')) {
-        extension = 'jpg';
-      } else if (imageUrl.match(/\.(png|jpg|jpeg)$/i)) {
-        const match = imageUrl.match(/\.(png|jpg|jpeg)$/i);
-        extension = match[1].toLowerCase();
-      }
-      
-      // Write to temp file first, then read back to ensure buffer is valid
+
+      const extension = path.extname(imageUrl).replace('.', '') || 'png';
       const tempDir = getTempDir();
-      const timestamp = Date.now();
-      const tempImagePath = path.join(tempDir, `waifu_${timestamp}.${extension}`);
-      
-      let finalBuffer = null;
-      
+      const tempPath = path.join(tempDir, `waifu_${Date.now()}.${extension}`);
+
       try {
-        // Write buffer to temp file
-        fs.writeFileSync(tempImagePath, imageBuffer);
-        
-        // Read back from file to ensure buffer is properly formed
-        finalBuffer = fs.readFileSync(tempImagePath);
-        
-        if (!finalBuffer || finalBuffer.length === 0) {
-          throw new Error('Failed to read image from temp file');
-        }
-        
-        // Send the image
-        await sock.sendMessage(extra.from, {
-          image: finalBuffer
-        }, { quoted: msg });
-        
+        fs.writeFileSync(tempPath, imageBuffer);
+
+        const artist = image.artists?.[0]?.name || 'Unknown';
+        const tags = image.tags?.map(tag => tag.name).join(', ') || 'None';
+
+        await sock.sendMessage(
+          extra.from,
+          {
+            image: fs.readFileSync(tempPath),
+            caption:
+`✨ Random Waifu
+
+🆔 ID: ${image.id}
+🎨 Artist: ${artist}
+🏷️ Tags: ${tags}
+📏 Resolution: ${image.width}×${image.height}
+❤️ Favorites: ${image.favorites}
+🔞 NSFW: ${image.isNsfw ? 'Yes' : 'No'}`
+          },
+          { quoted: msg }
+        );
       } finally {
-        // Cleanup temp file
-        try {
-          deleteTempFile(tempImagePath);
-        } catch (cleanupError) {
-          // Ignore cleanup errors
-        }
+        deleteTempFile(tempPath);
       }
-      
+
     } catch (error) {
       console.error('Error in waifu command:', error);
-      
-      // Handle specific error cases
-      if (error.response?.status === 404) {
-        await extra.reply('❌ Image not found. Please try again.');
-      } else if (error.response?.status === 429) {
-        await extra.reply('❌ Rate limit exceeded. Please try again later.');
-      } else if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-        await extra.reply('❌ Request timed out. Please try again.');
-      } else {
-        await extra.reply(`❌ Failed to fetch waifu image: ${error.message}`);
+
+      if (error.response?.status === 429) {
+        return extra.reply('❌ Rate limit exceeded. Please try again later.');
+      }
+
+      if (error.code === 'ECONNABORTED') {
+        return extra.reply('❌ Request timed out. Please try again.');
       }
+
+      return extra.reply(`❌ Failed to fetch image: ${error.message}`);
     }
   }
 };
-
diff --git a/commands/fun/cat.js b/commands/fun/cat.js
new file mode 100644
index 000000000..e84e4f082
--- /dev/null
+++ b/commands/fun/cat.js
@@ -0,0 +1,44 @@
+const axios = require("axios");
+
+module.exports = {
+  name: "cat",
+  aliases: ["kitty", "meow"],
+  category: "fun",
+  description: "Get a random cat image.",
+  usage: "cat",
+
+  async execute(sock, m) {
+    try {
+      const { data } = await axios.get(
+        "https://api.thecatapi.com/v1/images/search"
+      );
+
+      if (!data.length || !data[0].url) {
+        return await sock.sendMessage(
+          m.key.remoteJid,
+          { text: "❌ Failed to fetch a cat image." },
+          { quoted: m }
+        );
+      }
+
+      await sock.sendMessage(
+        m.key.remoteJid,
+        {
+          image: { url: data[0].url },
+          caption: "🐱 Meow!"
+        },
+        { quoted: m }
+      );
+    } catch (err) {
+      console.error(err);
+
+      await sock.sendMessage(
+        m.key.remoteJid,
+        {
+          text: "❌ An error occurred while fetching a cat image."
+        },
+        { quoted: m }
+      );
+    }
+  },
+};
diff --git a/commands/general/list.js b/commands/general/list.js
index e474689cf..a6cddf5ca 100644
--- a/commands/general/list.js
+++ b/commands/general/list.js
@@ -60,25 +60,12 @@ module.exports = {
         text: menu,
         footer: `> *Powered by ${config.botName}*`,
         buttons: [
+         
           {
             name: 'cta_url',
             buttonParamsJson: JSON.stringify({
-              display_text: 'Youtube',
-              url: config.social?.youtube || 'http://youtube.com/@mr_unique_hacker'
-            })
-          },
-          {
-            name: 'cta_url',
-            buttonParamsJson: JSON.stringify({
-              display_text: 'Visit Bot Repo',
-              url: config.social?.github || 'https://github.com/mruniquehacker'
-            })
-          },
-          {
-            name: 'cta_url',
-            buttonParamsJson: JSON.stringify({
-              display_text: 'Join Channel',
-              url: 'https://whatsapp.com/channel/0029Va90zAnIHphOuO8Msp3A'
+              display_text: 'Join Group',
+              url: 'https://chat.whatsapp.com/DXdVqaHPBM2Eed2DRJkd7S?s=cl&p=i&mlu=4&amv=0'
             })
           }
         ]
diff --git a/commands/general/menu.js b/commands/general/menu.js
index 35c737ac6..52166091b 100644
--- a/commands/general/menu.js
+++ b/commands/general/menu.js
@@ -2,201 +2,203 @@
  * Menu Command - Display all available commands
  */
 
+/**
+ * Dynamic Menu Command
+ */
+
+/**
+ * Menu Command - Display all available commands
+ */
+
+const fs = require('fs');
+const path = require('path');
 const config = require('../../config');
 const { loadCommands } = require('../../utils/commandLoader');
 
+// ===================================================
+// UTILITIES
+// ===================================================
+
+/**
+ * Creates a decorative header for menu sections.
+ * Matches the styling from user screenshots.
+ * @param {string} title - The title of the section.
+ * @returns {string} - The formatted header string.
+ */
+const createHeader = (title) => {
+    const padding = "━".repeat(3);
+    return `*[ ${title.toUpperCase()} ]*`;
+};
+
+/**
+ * Creates a separator line.
+ * @returns {string}
+ */
+const createSeparator = () => "──────────────";
+
+// ===================================================
+// MAIN COMMAND DEFINITION
+// ===================================================
+
 module.exports = {
-  name: 'menu',
-  aliases: ['help', 'commands'],
-  category: 'general',
-  description: 'Show all available commands',
-  usage: '.menu',
-  
-  async execute(sock, msg, args, extra) {
-    try {
-      const commands = loadCommands();
-      const categories = {};
-      
-      // Group commands by category
-      commands.forEach((cmd, name) => {
-        if (cmd.name === name) { // Only count main command names, not aliases
-          if (!categories[cmd.category]) {
-            categories[cmd.category] = [];
-          }
-          categories[cmd.category].push(cmd);
-        }
-      });
-      
-      const ownerNames = Array.isArray(config.ownerName) ? config.ownerName : [config.ownerName];
-      const displayOwner = ownerNames[0] || config.ownerName || 'Bot Owner';
-      
-      let menuText = `╭━━『 *${config.botName}* 』━━╮\n\n`;
-      menuText += `👋 Hello @${extra.sender.split('@')[0]}!\n\n`;
-      menuText += `⚡ Prefix: ${config.prefix}\n`;
-      menuText += `📦 Total Commands: ${commands.size}\n`;
-      menuText += `👑 Owner: ${displayOwner}\n\n`;
-      
-      // General Commands
-      if (categories.general) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🧭 GENERAL COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.general.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // AI Commands
-      if (categories.ai) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🤖 AI COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.ai.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // Group Commands
-      if (categories.group) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🔵 GROUP COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.group.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // Admin Commands
-      if (categories.admin) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🛡️ ADMIN COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.admin.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // Owner Commands
-      if (categories.owner) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 👑 OWNER COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.owner.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // Media Commands
-      if (categories.media) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🎞️ MEDIA COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.media.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      // Fun Commands
-      if (categories.fun) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🎭 FUN COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.fun.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-
-      // Economy Commands
-      if (categories.economy) {
-        const economyCmds = categories.economy.filter(
-          (cmd) => !cmd.ownerOnly || extra.isOwner
-        );
-        if (economyCmds.length) {
-          menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-          menuText += `┃ 💰 ECONOMY COMMAND\n`;
-          menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-          economyCmds.forEach(cmd => {
-            menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-          });
-          menuText += `\n`;
-        }
-      }
-      
-      // Utility Commands
-      if (categories.utility) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🔧 UTILITY COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.utility.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-
-       // Anime Commands
-       if (categories.anime) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 👾 ANIME COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.anime.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-
-       // Textmaker Commands
-       if (categories.utility) {
-        menuText += `┏━━━━━━━━━━━━━━━━━\n`;
-        menuText += `┃ 🖋️ TEXTMAKER COMMAND\n`;
-        menuText += `┗━━━━━━━━━━━━━━━━━\n`;
-        categories.textmaker.forEach(cmd => {
-          menuText += `│ ➜ ${config.prefix}${cmd.name}\n`;
-        });
-        menuText += `\n`;
-      }
-      
-      menuText += `╰━━━━━━━━━━━━━━━━━\n\n`;
-      menuText += `💡 Type ${config.prefix}help <command> for more info\n`;
-      menuText += `🌟 Bot Version: 1.0.3\n`;
-      
-      // Send menu with image
-      const fs = require('fs');
-      const path = require('path');
-      const imagePath = path.join(__dirname, '../../utils/bot_image.jpg');
-      
-      if (fs.existsSync(imagePath)) {
-        // Send image with newsletter forwarding context
-        const imageBuffer = fs.readFileSync(imagePath);
-        await sock.sendMessage(extra.from, {
-          image: imageBuffer,
-          caption: menuText,
-          mentions: [extra.sender],
-          contextInfo: {
-            forwardingScore: 1,
-            isForwarded: true,
-            forwardedNewsletterMessageInfo: {
-              newsletterJid: config.newsletterJid || '120363161513685998@newsletter',
-              newsletterName: config.botName,
-              serverMessageId: -1
+    name: 'menu',
+    aliases: ['commands'],
+    category: 'general',
+    description: 'Display the bot menu',
+    usage: '.menu [category]',
+
+    async execute(sock, msg, args, extra) {
+        try {
+            const commands = loadCommands();
+            const categories = {};
+            const unique = [];
+
+            // Process commands: remove aliases, organize by category
+            for (const [name, cmd] of commands.entries()) {
+                if (cmd.name !== name) continue;
+                unique.push(cmd);
+                const cat = (cmd.category || 'other').toLowerCase();
+                if (!categories[cat]) categories[cat] = [];
+                categories[cat].push(cmd);
+            }
+
+            // Define icons for categories
+            const categoryIcons = {
+                general: '⚖️', ai: '🤖', group: '👥', admin: '🛡️', media: '🎵',
+                download: '📥', downloader: '📥', utility: '⚙️', tools: '🧰',
+                owner: '👑', fun: '🎲', anime: '🌸', economy: '💰', games: '🎮',
+                search: '🔍', convert: '🔄', textmaker: '🎨', nsfw: '🍁',
+                misc: '📦', other: '📁'
+            };
+
+            const owner = Array.isArray(config.ownerName) ? config.ownerName[0] : config.ownerName;
+
+            // Define display order for main menu
+            const order = [
+                'general', 'ai', 'group', 'admin', 'media', 'download',
+                'downloader', 'utility', 'tools', 'fun', 'anime', 'economy',
+                'games', 'search', 'convert', 'textmaker', 'owner', 'misc', 'other'
+            ];
+
+            const sortedCategories = [
+                ...order.filter(c => categories[c]),
+                ...Object.keys(categories).filter(c => !order.includes(c)).sort()
+            ];
+
+            const requested = (args[0] || '').toLowerCase();
+            let text = '';
+
+            // ===================================================
+            // SECTION: CATEGORY MENU
+            // ===================================================
+
+            if (requested) {
+                if (!categories[requested]) {
+                    // Error State: Category not found
+                    text = `❌ Category *${requested}* was not found.\n\nAvailable categories:\n\n${sortedCategories.join(', ')}\n\nExample:\n${config.prefix}menu ai`;
+                } else {
+                    // Success State: Display commands in category with its dedicated emoji
+                    const cmds = categories[requested].sort((a, b) => a.name.localeCompare(b.name));
+                    const catEmoji = categoryIcons[requested] || '📁';
+                    
+                    text += createHeader(requested) + '\n\n';
+
+                    for (const cmd of cmds) {
+                        text += `${catEmoji} *${config.prefix}${cmd.name}*\n`;
+                    }
+
+                    text += `\n${createSeparator()}\n`;
+                    text += `💡 ${config.prefix}help <command>`;
+                }
+            }
+
+            // ===================================================
+            // SECTION: MAIN MENU
+            // ===================================================
+
+            else {
+                const uptime = process.uptime();
+                const hours = Math.floor(uptime / 3600);
+                const minutes = Math.floor((uptime % 3600) / 60);
+                const seconds = Math.floor(uptime % 60);
+
+                const ram = (process.memoryUsage().rss / 1024 / 1024).toFixed(0);
+
+                // Bot Info Header
+                text += createHeader(config.botName) + '\n\n';
+                text += `👤 User: @${extra.sender.split('@')[0]}\n`;
+                text += `👑 Owner: ${owner}\n`;
+                text += `⚡ Prefix: ${config.prefix}\n`;
+                text += `📦 Commands: ${unique.length}\n`;
+                text += `📂 Categories: ${sortedCategories.length}\n`;
+                text += `💾 RAM: ${ram} MB\n`;
+                text += `⏱️ Uptime: ${hours}h ${minutes}m ${seconds}s\n`;
+                text += `🖥 Platform: ${process.platform}`;
+
+                // Categories List
+                text += `\n\n${createSeparator()}\n\n`;
+                text += createHeader('Categories') + '\n\n';
+
+                for (const cat of sortedCategories) {
+                    text += `${categoryIcons[cat] || '📁'} ${cat.charAt(0).toUpperCase() + cat.slice(1)} (${categories[cat].length})\n`;
+                }
+
+                // Footer Instructions
+                text += `\n${createSeparator()}\n\n`;
+                text += `💡 ${config.prefix}menu <category>\n`;
+                text += `💡 ${config.prefix}help <command>\n\n`;
+                text += `Examples\n`;
+                text += `${config.prefix}menu ai\n`;
+                text += `${config.prefix}menu download`;
             }
-          }
-        }, { quoted: msg });
-      } else {
-        await sock.sendMessage(extra.from, {
-          text: menuText,
-          mentions: [extra.sender]
-        }, { quoted: msg });
-      }
-      
-    } catch (error) {
-      await extra.reply(`❌ Error: ${error.message}`);
+
+            // ===================================================
+            // SEND MESSAGE
+            // ===================================================
+
+            const imagePath = path.join(__dirname, '../../utils/bot_image.jpg');
+
+            if (fs.existsSync(imagePath)) {
+                // Send as image with caption (preferred)
+                await sock.sendMessage(
+                    extra.from,
+                    {
+                        image: fs.readFileSync(imagePath),
+                        caption: text,
+                        mentions: [extra.sender],
+                        contextInfo: {
+                            forwardingScore: 1,
+                            isForwarded: true,
+                            forwardedNewsletterMessageInfo: {
+                                newsletterJid: config.newsletterJid || '120363161513685996@newsletter',
+                                newsletterName: config.botName,
+                                serverMessageId: -1
+                            }
+                        }
+                    },
+                    { quoted: msg }
+                );
+            } else {
+                // Fallback to text message
+                await sock.sendMessage(
+                    extra.from,
+                    {
+                        text,
+                        mentions: [extra.sender]
+                    },
+                    { quoted: msg }
+                );
+            }
+
+        } catch (err) {
+            console.error(err);
+            await sock.sendMessage(
+                extra.from,
+                {
+                    text: `❌ ${err.message}`
+                },
+                { quoted: msg }
+            );
+        }
     }
-  }
 };
diff --git a/commands/media/facebook.js b/commands/media/facebook.js
index 1c057a09b..77ab1027d 100644
--- a/commands/media/facebook.js
+++ b/commands/media/facebook.js
@@ -2,172 +2,58 @@
  * Facebook Downloader - Download Facebook videos
  */
 
-const { facebookdl } = require('@bochilteam/scraper-facebook');
-const axios = require('axios');
-const config = require('../../config');
-
-// Store processed message IDs to prevent duplicates
-const processedMessages = new Set();
+const axios = require("axios");
 
 module.exports = {
-  name: 'facebook',
-  aliases: ['fb', 'fbdl', 'facebookdl'],
-  category: 'media',
-  description: 'Download Facebook videos',
-  usage: '.facebook <Facebook URL>',
-  
-  async execute(sock, msg, args, extra) {
+  name: "facebook",
+  aliases: ["fb", "fbdl", "facebookdl"],
+  category: "media",
+  description: "Download Facebook videos.",
+  usage: "facebook <facebook video url>",
+
+  async execute(sock, msg, args) {
     try {
-      // Check if message has already been processed
-      if (processedMessages.has(msg.key.id)) {
-        return;
-      }
-      
-      // Add message ID to processed set
-      processedMessages.add(msg.key.id);
-      
-      // Clean up old message IDs after 5 minutes
-      setTimeout(() => {
-        processedMessages.delete(msg.key.id);
-      }, 5 * 60 * 1000);
-      
-      const text = msg.message?.conversation || 
-                   msg.message?.extendedTextMessage?.text ||
-                   args.join(' ');
-      
-      if (!text) {
-        return await extra.reply('Please provide a Facebook link for the video.');
+      if (!args.length) {
+        return await sock.sendMessage(msg.key.remoteJid, {
+          text: "❌ Please provide a Facebook video URL."
+        }, { quoted: msg });
       }
-      
-      // Extract URL from command
-      const url = text.split(' ').slice(1).join(' ').trim();
-      
-      if (!url) {
-        return await extra.reply('Please provide a Facebook link for the video.');
-      }
-      
-      // Check for various Facebook URL formats
-      const facebookPatterns = [
-        /https?:\/\/(?:www\.|m\.)?facebook\.com\//,
-        /https?:\/\/(?:www\.|m\.)?fb\.com\//,
-        /https?:\/\/fb\.watch\//,
-        /https?:\/\/(?:www\.)?facebook\.com\/watch/,
-        /https?:\/\/(?:www\.)?facebook\.com\/.*\/videos\//
-      ];
-      
-      const isValidUrl = facebookPatterns.some(pattern => pattern.test(url));
-      
-      if (!isValidUrl) {
-        return await extra.reply('That is not a valid Facebook link. Please provide a valid Facebook video link.');
+
+      const url = args.join(" ");
+      const api = `https://api.princetechn.com/api/download/facebook?apikey=prince&url=${encodeURIComponent(url)}`;
+
+      const { data } = await axios.get(api);
+
+      if (!data.success || !data.result) {
+        return await sock.sendMessage(msg.key.remoteJid, {
+          text: "❌ Failed to fetch the Facebook video."
+        }, { quoted: msg });
       }
-      
-      await sock.sendMessage(extra.from, {
-        react: { text: '🔄', key: msg.key }
-      });
-      
-      try {
-        // Use @bochilteam/scraper-facebook
-        const data = await facebookdl(url);
-        
-        if (!data || !data.video || !Array.isArray(data.video) || data.video.length === 0) {
-          throw new Error('No video data found');
-        }
-        
-        // Get the highest quality video (first in array is usually highest)
-        const videoOption = data.video[0];
-        if (!videoOption || !videoOption.download) {
-          throw new Error('No video download function found');
-        }
-        
-        // Call the download function to get the video URL or buffer
-        const videoData = await videoOption.download();
-        
-        let videoUrl = null;
-        let videoBuffer = null;
-        
-        // Check if it's a URL or buffer
-        if (typeof videoData === 'string') {
-          videoUrl = videoData;
-        } else if (Buffer.isBuffer(videoData)) {
-          videoBuffer = videoData;
-        } else if (videoData && videoData.url) {
-          videoUrl = videoData.url;
-        } else if (videoData && videoData.data) {
-          videoBuffer = Buffer.from(videoData.data);
-        } else {
-          throw new Error('Invalid video data format');
-        }
-        
-        // Build caption with video info
-        const botName = config.botName.toUpperCase();
-        let caption = `*DOWNLOADED BY ${botName}*`;
-        
-        const parts = [];
-        
-        if (data.duration) {
-          parts.push(`⏱️ Duration: ${data.duration}`);
-        }
-        
-        if (videoOption.quality) {
-          parts.push(`📹 Quality: ${videoOption.quality}`);
-        }
-        
-        if (parts.length > 0) {
-          caption += '\n\n' + parts.join('\n');
-        }
-        
-        // Send video
-        if (videoBuffer) {
-          // Send as buffer
-          await sock.sendMessage(extra.from, {
-            video: videoBuffer,
-            mimetype: 'video/mp4',
-            caption: caption
-          }, { quoted: msg });
-        } else if (videoUrl) {
-          // Try URL first
-          try {
-            await sock.sendMessage(extra.from, {
-              video: { url: videoUrl },
-              mimetype: 'video/mp4',
-              caption: caption
-            }, { quoted: msg });
-          } catch (urlError) {
-            // If URL fails, download and send as buffer
-            console.error('URL send failed, trying buffer method:', urlError.message);
-            try {
-              const videoResponse = await axios.get(videoUrl, {
-                responseType: 'arraybuffer',
-                timeout: 60000,
-                maxContentLength: 100 * 1024 * 1024,
-                headers: {
-                  'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
-                  'Referer': 'https://www.facebook.com/'
-                }
-              });
-              
-              const buffer = Buffer.from(videoResponse.data);
-              await sock.sendMessage(extra.from, {
-                video: buffer,
-                mimetype: 'video/mp4',
-                caption: caption
-              }, { quoted: msg });
-            } catch (bufferError) {
-              console.error('Buffer method also failed:', bufferError.message);
-              throw new Error('Failed to send video');
-            }
-          }
-        } else {
-          throw new Error('No video URL or buffer found');
-        }
-        
-      } catch (error) {
-        console.error('Error in Facebook download:', error);
-        await extra.reply(`❌ Failed to download Facebook video.\n\nError: ${error.message}\n\nPlease try again with a different link.`);
+
+      const videoUrl = data.result.hd_video || data.result.sd_video;
+
+      if (!videoUrl) {
+        return await sock.sendMessage(msg.key.remoteJid, {
+          text: "❌ No downloadable video was found."
+        }, { quoted: msg });
       }
-    } catch (error) {
-      console.error('Error in Facebook command:', error);
-      await extra.reply('An error occurred while processing the request. Please try again later.');
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          video: { url: videoUrl },
+          mimetype: "video/mp4",
+          caption: `📹 *${data.result.title || "Facebook Video"}*\n\n⏱ Duration: ${data.result.duration || "Unknown"}`
+        },
+        { quoted: msg }
+      );
+
+    } catch (err) {
+      console.error(err);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: "❌ An error occurred while downloading the Facebook video."
+      }, { quoted: msg });
     }
   }
 };
diff --git a/commands/media/spotify.js b/commands/media/spotify.js
new file mode 100644
index 000000000..51c32f532
--- /dev/null
+++ b/commands/media/spotify.js
@@ -0,0 +1,57 @@
+const axios = require('axios');
+
+module.exports = {
+  name: 'spotify',
+  aliases: ['sp', 'spotifymp3', 'spotifydl'],
+  category: 'media',
+  description: 'Download a Spotify track as MP3.',
+  usage: '<spotify_url>',
+
+  async execute(sock, msg, args) {
+    try {
+      if (!args.length) {
+        return sock.sendMessage(
+          msg.key.remoteJid,
+          {
+            text: `❌ Please provide a Spotify track URL.\n\nExample:\n.spotify https://open.spotify.com/track/...`
+          },
+          { quoted: msg }
+        );
+      }
+
+      const url = args[0];
+
+      const { data } = await axios.get(
+        `https://api-olive-five-53.vercel.app/spotify?url=${encodeURIComponent(url)}`
+      );
+
+      if (!data?.data?.download) {
+        return sock.sendMessage(
+          msg.key.remoteJid,
+          { text: '❌ Failed to fetch the download link.' },
+          { quoted: msg }
+        );
+      }
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          document: { url: data.data.download },
+          mimetype: 'audio/mpeg',
+          fileName: 'spotify.mp3'
+        },
+        { quoted: msg }
+      );
+    } catch (err) {
+      console.error(err);
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          text: `❌ An error occurred while downloading the Spotify track.\n\n${err.response?.data?.message || err.message}`
+        },
+        { quoted: msg }
+      );
+    }
+  }
+};
diff --git a/commands/media/tiktok.js b/commands/media/tiktok.js
index b151560fb..f7ff8a24c 100644
--- a/commands/media/tiktok.js
+++ b/commands/media/tiktok.js
@@ -2,189 +2,74 @@
  * TikTok Downloader - Download TikTok videos
  */
 
-const { ttdl } = require('ruhend-scraper');
-const axios = require('axios');
-const APIs = require('../../utils/api');
-const config = require('../../config');
-
-// Store processed message IDs to prevent duplicates
-const processedMessages = new Set();
+const axios = require("axios");
 
 module.exports = {
-  name: 'tiktok',
-  aliases: ['tt', 'ttdl', 'tiktokdl'],
-  category: 'media',
-  description: 'Download TikTok videos',
-  usage: '.tiktok <TikTok URL>',
-  
+  name: "tiktok",
+  aliases: ["tt", "ttdl", "tik", "tikdl"],
+  category: "media",
+  description: "Download TikTok videos without watermark.",
+  usage: "tiktok <tiktok url>",
+
   async execute(sock, msg, args) {
     try {
-      // Check if message has already been processed
-      if (processedMessages.has(msg.key.id)) {
-        return;
-      }
-      
-      // Add message ID to processed set
-      processedMessages.add(msg.key.id);
-      
-      // Clean up old message IDs after 5 minutes
-      setTimeout(() => {
-        processedMessages.delete(msg.key.id);
-      }, 5 * 60 * 1000);
-      
-      const text = msg.message?.conversation || 
-                   msg.message?.extendedTextMessage?.text ||
-                   args.join(' ');
-      
-      if (!text) {
-        return await sock.sendMessage(msg.key.remoteJid, { 
-          text: 'Please provide a TikTok link for the video.' 
-        }, { quoted: msg });
+      if (!args.length) {
+        return await sock.sendMessage(
+          msg.key.remoteJid,
+          {
+            text: "❌ Please provide a TikTok video URL."
+          },
+          { quoted: msg }
+        );
       }
-      
-      // Extract URL from command
-      const url = text.split(' ').slice(1).join(' ').trim();
-      
-      if (!url) {
-        return await sock.sendMessage(msg.key.remoteJid, { 
-          text: 'Please provide a TikTok link for the video.' 
-        }, { quoted: msg });
-      }
-      
-      // Check for various TikTok URL formats
-      const tiktokPatterns = [
-        /https?:\/\/(?:www\.)?tiktok\.com\//,
-        /https?:\/\/(?:vm\.)?tiktok\.com\//,
-        /https?:\/\/(?:vt\.)?tiktok\.com\//,
-        /https?:\/\/(?:www\.)?tiktok\.com\/@/,
-        /https?:\/\/(?:www\.)?tiktok\.com\/t\//
-      ];
-      
-      const isValidUrl = tiktokPatterns.some(pattern => pattern.test(url));
-      
-      if (!isValidUrl) {
-        return await sock.sendMessage(msg.key.remoteJid, { 
-          text: 'That is not a valid TikTok link. Please provide a valid TikTok video link.' 
-        }, { quoted: msg });
+
+      const url = args.join(" ");
+      const api = `https://api.princetechn.com/api/download/tiktok?apikey=prince&url=${encodeURIComponent(url)}`;
+
+      const { data } = await axios.get(api);
+
+      if (!data.success || !data.result) {
+        return await sock.sendMessage(
+          msg.key.remoteJid,
+          {
+            text: "❌ Failed to fetch the TikTok video."
+          },
+          { quoted: msg }
+        );
       }
-      
-      await sock.sendMessage(msg.key.remoteJid, {
-        react: { text: '🔄', key: msg.key }
-      });
-      
-      try {
-        let videoUrl = null;
-        let title = null;
-        
-        // Try Siputzx API first
-        try {
-          const result = await APIs.getTikTokDownload(url);
-          videoUrl = result.videoUrl;
-          title = result.title;
-        } catch (apiError) {
-          console.error(`Siputzx API failed: ${apiError.message}`);
-        }
-        
-        // If Siputzx API didn't work, try ttdl method
-        if (!videoUrl) {
-          try {
-            let downloadData = await ttdl(url);
-            if (downloadData && downloadData.data && downloadData.data.length > 0) {
-              const mediaData = downloadData.data;
-              for (let i = 0; i < Math.min(20, mediaData.length); i++) {
-                const media = mediaData[i];
-                const mediaUrl = media.url;
-                const isVideo = /\.(mp4|mov|avi|mkv|webm)$/i.test(mediaUrl) || media.type === 'video';
-                
-                if (isVideo) {
-                  await sock.sendMessage(msg.key.remoteJid, {
-                    video: { url: mediaUrl },
-                    mimetype: 'video/mp4',
-                    caption: `*DOWNLOADED BY ${config.botName.toUpperCase()}*`
-                  }, { quoted: msg });
-                } else {
-                  await sock.sendMessage(msg.key.remoteJid, {
-                    image: { url: mediaUrl },
-                    caption: `*DOWNLOADED BY ${config.botName.toUpperCase()}*`
-                  }, { quoted: msg });
-                }
-              }
-              return;
-            }
-          } catch (ttdlError) {
-            console.error('ttdl fallback also failed:', ttdlError.message);
-          }
-        }
-        
-        // Send the video if we got a URL
-        if (videoUrl) {
-          try {
-            // Download video as buffer
-            const videoResponse = await axios.get(videoUrl, {
-              responseType: 'arraybuffer',
-              timeout: 60000,
-              maxContentLength: 100 * 1024 * 1024, // 100MB limit
-              headers: {
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-                'Accept': 'video/mp4,video/*,*/*;q=0.9',
-                'Accept-Language': 'en-US,en;q=0.9',
-                'Accept-Encoding': 'gzip, deflate, br',
-                'Connection': 'keep-alive',
-                'Referer': 'https://www.tiktok.com/'
-              }
-            });
-            
-            const videoBuffer = Buffer.from(videoResponse.data);
-            
-            if (videoBuffer.length === 0) {
-              throw new Error('Video buffer is empty');
-            }
-            
-            const botName = config.botName.toUpperCase();
-            const caption = title ? `*DOWNLOADED BY ${botName}*\n\n📝 Title: ${title}` : `*DOWNLOADED BY ${botName}*`;
-            
-            await sock.sendMessage(msg.key.remoteJid, {
-              video: videoBuffer,
-              mimetype: 'video/mp4',
-              caption: caption
-            }, { quoted: msg });
-            
-            return;
-          } catch (downloadError) {
-            console.error(`Failed to download video: ${downloadError.message}`);
-            // Fallback to URL method
-            try {
-              const botName = config.botName.toUpperCase();
-              const caption = title ? `*DOWNLOADED BY ${botName}*\n\n📝 Title: ${title}` : `*DOWNLOADED BY ${botName}*`;
-              
-              await sock.sendMessage(msg.key.remoteJid, {
-                video: { url: videoUrl },
-                mimetype: 'video/mp4',
-                caption: caption
-              }, { quoted: msg });
-              return;
-            } catch (urlError) {
-              console.error(`URL method also failed: ${urlError.message}`);
-            }
-          }
-        }
-        
-        // If we reach here, no method worked
-        return await sock.sendMessage(msg.key.remoteJid, { 
-          text: '❌ Failed to download TikTok video. All download methods failed. Please try again with a different link.' 
-        }, { quoted: msg });
-        
-      } catch (error) {
-        console.error('Error in TikTok download:', error);
-        await sock.sendMessage(msg.key.remoteJid, { 
-          text: 'Failed to download the TikTok video. Please try again with a different link.' 
-        }, { quoted: msg });
+
+      const { title, duration, video, author } = data.result;
+
+      if (!video) {
+        return await sock.sendMessage(
+          msg.key.remoteJid,
+          {
+            text: "❌ No downloadable video was found."
+          },
+          { quoted: msg }
+        );
       }
-    } catch (error) {
-      console.error('Error in TikTok command:', error);
-      await sock.sendMessage(msg.key.remoteJid, { 
-        text: 'An error occurred while processing the request. Please try again later.' 
-      }, { quoted: msg });
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          video: { url: video },
+          mimetype: "video/mp4",
+          caption: `🎵 *${title || "TikTok Video"}*\n\n👤 Author: ${author?.name || "Unknown"}\n⏱ Duration: ${duration || 0}s`
+        },
+        { quoted: msg }
+      );
+
+    } catch (err) {
+      console.error(err);
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          text: "❌ An error occurred while downloading the TikTok video."
+        },
+        { quoted: msg }
+      );
     }
   }
-};
\ No newline at end of file
+};
diff --git a/commands/media/video.js b/commands/media/video.js
index c7ee97f0b..29b7122ff 100644
--- a/commands/media/video.js
+++ b/commands/media/video.js
@@ -7,17 +7,18 @@ const APIs = require('../../utils/api');
 const config = require('../../config');
 
 module.exports = {
-  name: 'ytvideo',
-  aliases: ['ytv', 'ytmp4', 'ytvid', 'video'],
+  name: 'ytdoc',
+  aliases: ['yt', 'ytvd'],
   category: 'media',
-  description: 'Download video from YouTube',
+  description: 'Download video from YouTube document format',
   usage: '.video <video name or URL>',
 
   async execute(sock, msg, args) {
     try {
       // Get instance-specific config
-      const instanceConfig = config.getConfigFromSocket(sock);
-
+      // const instanceConfig = config.getConfigFromSocket(sock);
+      // the command above is very useless and crashes the bot
+      
       const text = args.join(' ');
       const chatId = msg.key.remoteJid;
 
@@ -85,12 +86,12 @@ module.exports = {
       }
 
       // Send video directly using the download URL
-      await sock.sendMessage(chatId, {
-        video: { url: videoData.download },
-        mimetype: 'video/mp4',
-        fileName: `${(videoData.title || videoTitle || 'video').replace(/[^\w\s-]/g, '')}.mp4`,
-        caption: `*${videoData.title || videoTitle || 'Video'}*\n\n> *_Downloaded by ${instanceConfig.botName}_*`
-      }, { quoted: msg });
+    await sock.sendMessage(chatId, {
+  document: { url: videoData.download },
+  mimetype: 'application/octet-stream', // or 'video/mp4'
+  fileName: `${(videoData.title || videoTitle || 'video').replace(/[^\w\s-]/g, '')}.mp4`,
+  caption: `*${videoData.title || videoTitle || 'Video'}*\n\n> *_Downloaded by FOUNDER MINI 🤖_*`
+}, { quoted: msg });
 
     } catch (error) {
       console.error('[VIDEO] Command Error:', error?.message || error);
@@ -99,4 +100,4 @@ module.exports = {
       }, { quoted: msg });
     }
   }
-};
\ No newline at end of file
+};
diff --git a/commands/media/xdown.js b/commands/media/xdown.js
new file mode 100644
index 000000000..5d79a7c8e
--- /dev/null
+++ b/commands/media/xdown.js
@@ -0,0 +1,89 @@
+const axios = require("axios");
+
+module.exports = {
+  name: "xdl",
+  aliases: ["xvdl", "xl"],
+  category: "nsfw",
+  description: "Download videos from XVideos",
+  usage: ".xvideos <xvideos url>",
+  ownerOnly: false,
+
+  async execute(sock, msg, args) {
+    try {
+      const chatId = msg.key.remoteJid;
+
+      if (!args.length) {
+        return await sock.sendMessage(
+          chatId,
+          {
+            text: "❌ Please provide an XVideos URL.",
+          },
+          { quoted: msg }
+        );
+      }
+
+      const url = args.join(" ").trim();
+
+      const { data } = await axios.get(
+        `https://api.princetechn.com/api/download/xvideosdl?apikey=prince&url=${encodeURIComponent(url)}`
+      );
+
+      if (!data.success || !data.result) {
+        throw new Error("Failed to fetch video.");
+      }
+
+      const video = data.result;
+
+      if (!video.download_url) {
+        throw new Error("Download URL not found.");
+      }
+
+      // Send thumbnail with video information
+      await sock.sendMessage(
+        chatId,
+        {
+          image: {
+            url: video.thumbnail,
+          },
+          caption: `*${video.title}*
+
+👁️ Views: ${video.views}
+👍 Likes: ${video.likes}
+👎 Dislikes: ${video.dislikes}
+📦 Size: ${video.size}
+
+> Downloading video...`,
+        },
+        { quoted: msg }
+      );
+
+      // Send the video
+      await sock.sendMessage(
+        chatId,
+        {
+          video: {
+            url: video.download_url,
+          },
+          mimetype: "video/mp4",
+          fileName: `${video.title}.mp4`,
+          caption: `*${video.title}*
+
+📦 Size: ${video.size}
+
+> *_Downloaded by FOUNDER MINI 🤖_*`,
+        },
+        { quoted: msg }
+      );
+    } catch (err) {
+      console.error("[XVIDEOS]", err.response?.data || err);
+
+      await sock.sendMessage(
+        msg.key.remoteJid,
+        {
+          text: `❌ Download failed.\n${err.response?.data?.message || err.message}`,
+        },
+        { quoted: msg }
+      );
+    }
+  },
+};
diff --git a/commands/media/xvid.js b/commands/media/xvid.js
new file mode 100644
index 000000000..348600e74
--- /dev/null
+++ b/commands/media/xvid.js
@@ -0,0 +1,82 @@
+const xvideos = require("@rodrigogs/xvideos");
+
+module.exports = {
+  name: "xs",
+  aliases: ["xvideos", "xs"],
+  category: "nsfw",
+  description: "Search videos on XVideos",
+  usage: "xvid <query>",
+  ownerOnly: false,
+
+  async execute(sock, msg, args, extra) {
+    try {
+      const query = args.join(" ").trim();
+
+      if (!query) {
+        return await sock.sendMessage(
+          extra.from,
+          {
+            text: "❌ Please provide a search query.",
+          },
+          {
+            quoted: msg,
+          }
+        );
+      }
+      const randomInt = Math.floor(Math.random() * 10) + 1;
+      const results = await xvideos.videos.search({
+        k: query,
+        page: randomInt
+      });
+
+      const videos = results.videos;
+
+      if (!Array.isArray(videos) || videos.length === 0) {
+        return await sock.sendMessage(
+          extra.from,
+          {
+            text: "❌ No results found.",
+          },
+          {
+            quoted: msg,
+          }
+        );
+      }
+
+      const text = videos
+        .slice(0, 15)
+        .map((video, index) => {
+          return `*${index + 1}. ${video.title}*
+⏱️ *Duration:* ${video.duration}
+👤 *Uploader:* ${video.profile}
+👁️ *Views:* ${video.watchCount?.toLocaleString?.() ?? video.watchCount}
+🆔 *Video ID:* ${video.videoId}
+🔗 *URL:* ${video.url}`;
+        })
+        .join("\n\n");
+
+      await sock.sendMessage(
+        extra.from,
+        {
+          text: `*Results for "${query}"*\n\n${text}`,
+          mentions: [extra.sender],
+        },
+        {
+          quoted: msg,
+        }
+      );
+    } catch (err) {
+      console.error("[xvid] Error:", err);
+
+      await sock.sendMessage(
+        extra.from,
+        {
+          text: "❌ Something went wrong while searching XVideos.",
+        },
+        {
+          quoted: msg,
+        }
+      );
+    }
+  },
+};
diff --git a/commands/media/ytdoc.js b/commands/media/ytdoc.js
new file mode 100644
index 000000000..20178af3a
--- /dev/null
+++ b/commands/media/ytdoc.js
@@ -0,0 +1,99 @@
+const yts = require('yt-search');
+const APIs = require('../../utils/api');
+const config = require('../../config');
+
+module.exports = {
+  name: 'ytvideo',
+  aliases: ['ytv', 'ytmp4', 'ytvid', 'video'],
+  category: 'media',
+  description: 'Download video from YouTube',
+  usage: '.video <video name or URL>',
+
+  async execute(sock, msg, args) {
+    try {
+      // Get instance-specific config
+      // const instanceConfig = config.getConfigFromSocket(sock);
+      // the command above is very useless and crashes the bot
+      
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      const searchQuery = text.trim();
+
+      if (!searchQuery) {
+        return await sock.sendMessage(chatId, {
+          text: 'What video do you want to download?'
+        }, { quoted: msg });
+      }
+
+      // Determine if input is a YouTube link
+      let videoUrl = '';
+      let videoTitle = '';
+      let videoThumbnail = '';
+
+      if (searchQuery.startsWith('http://') || searchQuery.startsWith('https://')) {
+        videoUrl = searchQuery;
+      } else {
+        // Search YouTube for the video
+        const { videos } = await yts(searchQuery);
+        if (!videos || videos.length === 0) {
+          return await sock.sendMessage(chatId, {
+            text: 'No videos found!'
+          }, { quoted: msg });
+        }
+        videoUrl = videos[0].url;
+        videoTitle = videos[0].title;
+        videoThumbnail = videos[0].thumbnail;
+      }
+
+      // Send thumbnail immediately
+      try {
+        const ytId = (videoUrl.match(/(?:youtu\.be\/|v=)([a-zA-Z0-9_-]{11})/) || [])[1];
+        const thumb = videoThumbnail || (ytId ? `https://i.ytimg.com/vi/${ytId}/sddefault.jpg` : undefined);
+        const captionTitle = videoTitle || searchQuery;
+        if (thumb) {
+          await sock.sendMessage(chatId, {
+            image: { url: thumb },
+            caption: `*${captionTitle}*\nDownloading...`
+          }, { quoted: msg });
+        }
+      } catch (e) {
+        console.error('[VIDEO] thumb error:', e?.message || e);
+      }
+
+      // Validate YouTube URL
+      let urls = videoUrl.match(/(?:https?:\/\/)?(?:youtu\.be\/|(?:www\.|m\.)?youtube\.com\/(?:watch\?v=|v\/|embed\/|shorts\/|playlist\?list=)?)([a-zA-Z0-9_-]{11})/gi);
+      if (!urls) {
+        return await sock.sendMessage(chatId, {
+          text: 'This is not a valid YouTube link!'
+        }, { quoted: msg });
+      }
+
+      // Get video: try EliteProTech first, then Yupra, then Okatsu fallback
+      let videoData;
+      try {
+        videoData = await APIs.getEliteProTechVideoByUrl(videoUrl);
+      } catch (e1) {
+        try {
+          videoData = await APIs.getYupraVideoByUrl(videoUrl);
+        } catch (e2) {
+          videoData = await APIs.getOkatsuVideoByUrl(videoUrl);
+        }
+      }
+
+      // Send video directly using the download URL
+      await sock.sendMessage(chatId, {
+        video: { url: videoData.download },
+        mimetype: 'video/mp4',
+        fileName: `${(videoData.title || videoTitle || 'video').replace(/[^\w\s-]/g, '')}.mp4`,
+        caption: `*${videoData.title || videoTitle || 'Video'}*\n\n> *_Downloaded by FOUNDER MINI 🤖_*`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('[VIDEO] Command Error:', error?.message || error);
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: 'Download failed: ' + (error?.message || 'Unknown error')
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/media/yts.js b/commands/media/yts.js
new file mode 100644
index 000000000..772b50be4
--- /dev/null
+++ b/commands/media/yts.js
@@ -0,0 +1,62 @@
+const axios = require("axios");
+
+module.exports = {
+  name: "yts",
+  aliases: ["svid", "ytsearch"],
+  category: "media",
+  description: "Search videos on YouTube",
+  usage: "yts <query>",
+  ownerOnly: false,
+
+  async execute(sock, msg, args, extra) {
+    try {
+      const query = args.join(" ").trim();
+
+      if (!query) {
+        return await sock.sendMessage(extra.from, {
+          text: "❌ Please provide a search query."
+        }, {
+            quoted: msg
+        });
+      }
+
+      const { data } = await axios.get(
+        `https://api-olive-five-53.vercel.app/yts?q=${encodeURIComponent(query)}`
+      );
+
+      if (!Array.isArray(data) || data.length === 0) {
+        return await sock.sendMessage(extra.from, {
+          text: "❌ No results found."
+        },
+        {
+            quoted: msg
+        });
+      }
+
+      const text = data
+        .slice(0, 15) // Show only the first 5 results
+        .map((video, index) => {
+          return `*${index + 1}. ${video.title}*
+📺 *Channel: ${video.channel}*
+🔗 *Url: ${video.url}*`;
+        })
+        .join("\n\n");
+
+      await sock.sendMessage(
+        extra.from,
+        {
+          text: `*Results for ${query}* ✨💫 \n\n${text} \n\n ☄️ FOUNDER ☄️`,
+          mentions: [extra.sender],
+        },
+        { quoted: msg }
+      );
+
+    } catch (err) {
+      console.error("[yts] Error:", err);
+
+      await sock.sendMessage(extra.from, {
+        text: "❌ Something went wrong while searching YouTube."
+      });
+    }
+  },
+};
diff --git a/commands/owner/blocklist.js b/commands/owner/blocklist.js
new file mode 100644
index 000000000..1b09ee6ba
--- /dev/null
+++ b/commands/owner/blocklist.js
@@ -0,0 +1,35 @@
+module.exports = {
+    name: 'blocklist',
+    aliases: ['blocked', 'listblocked'],
+    category: 'owner',
+    desc: 'View the bot block list',
+    usage: 'blocklist',
+    ownerOnly: true,
+    reactions: {
+        start: '📋',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            const blocked = await sock.fetchBlocklist();
+
+            if (!blocked || blocked.length === 0) {
+                return reply('✅ The bot has not blocked anyone.');
+            }
+
+            let text = `🚫 *Blocked Users (${blocked.length})*\n\n`;
+
+            blocked.forEach((jid, i) => {
+                const number = jid.split('@')[0];
+                text += `${i + 1}. wa.me/${number}\n`;
+            });
+
+            return reply(text);
+        } catch (err) {
+            console.error(err);
+            return reply('❌ Failed to fetch the block list.');
+        }
+    }
+};
diff --git a/commands/owner/disp.js b/commands/owner/disp.js
new file mode 100644
index 000000000..7c2b3bd51
--- /dev/null
+++ b/commands/owner/disp.js
@@ -0,0 +1,57 @@
+module.exports = {
+    name: 'disappearing',
+    aliases: ['disappear', 'ephemeral'],
+    category: 'admin',
+    description: 'Enable or disable disappearing messages',
+    usage: 'disappearing <off|24h|7d|90d>',
+    groupOnly: true,
+    adminOnly: true,
+    reactions: {
+        start: '⏳',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            if (!args.length) {
+                return reply(
+                    `❌ Please choose a duration.\n\n` +
+                    `Example:\n` +
+                    `.disappearing off\n` +
+                    `.disappearing 24h\n` +
+                    `.disappearing 7d\n` +
+                    `.disappearing 90d`
+                );
+            }
+
+            const option = args[0].toLowerCase();
+
+            const durations = {
+                off: 0,
+                "24h": 86400,
+                "7d": 604800,
+                "90d": 7776000
+            };
+
+            if (!(option in durations)) {
+                return reply("❌ Invalid option. Use: off, 24h, 7d, or 90d.");
+            }
+
+            await sock.groupToggleEphemeral(
+                msg.key.remoteJid,
+                durations[option]
+            );
+
+            const status =
+                durations[option] === 0
+                    ? "Disabled"
+                    : `Enabled (${option})`;
+
+            return reply(`✅ Disappearing messages: *${status}*`);
+        } catch (err) {
+            console.error(err);
+            return reply("❌ Failed to update disappearing messages.");
+        }
+    }
+};
diff --git a/commands/owner/hi.js b/commands/owner/hi.js
new file mode 100644
index 000000000..b7117e432
--- /dev/null
+++ b/commands/owner/hi.js
@@ -0,0 +1,25 @@
+// attempt at making a command
+
+module.exports = {
+  name: 'hy',
+  aliases: ["hello", "hi", "h"],
+  category: 'owner',
+  description: 'greet bot',
+  usage: 'ill add later',
+  ownerOnly: true,
+
+  async execute(sock, msg, args, extra) {
+    try {
+        await sock.sendMessage(extra.from, {
+        text: `Greetings @${extra.sender.split('@')[0]} 👻, Everything seems to be working just fine 🤖`,
+          mentions: [extra.sender],
+      }, { quoted: msg });
+
+    } catch (err) {
+      console.error('[hi cmd] error:', err);
+      return extra.reply('❌ Error something went horribly wrong.');
+    }
+  },
+};
+
+
diff --git a/commands/owner/join.js b/commands/owner/join.js
new file mode 100644
index 000000000..3e63820b9
--- /dev/null
+++ b/commands/owner/join.js
@@ -0,0 +1,44 @@
+module.exports = {
+    name: 'join',
+    aliases: ['j'],
+    desc: 'Join a WhatsApp group using an invite link',
+    category: 'admin',
+
+    ownerOnly: true,
+
+    reactions: {
+        start: '🔗',
+        success: '✅'
+    },
+
+    execute: async (sock, msg, args, {
+        reply,
+        react
+    }) => {
+        try {
+            await react('🔗');
+
+            if (!args.length) {
+                return reply('Example:\n.join https://chat.whatsapp.com/xxxxxxxxxxxxxxxxxxxxxx');
+            }
+
+            const link = args.join(' ');
+
+            const match = link.match(/chat\.whatsapp\.com\/([A-Za-z0-9]{20,24})/i);
+
+            if (!match) {
+                return reply('❌ Invalid WhatsApp invite link.');
+            }
+
+            const code = match[1];
+
+            await sock.groupAcceptInvite(code);
+
+            await react('✅');
+            reply('✅ Successfully joined the group.');
+        } catch (err) {
+            console.error(err);
+            reply(`❌ ${err.message}`);
+        }
+    }
+};
diff --git a/commands/owner/leave.js b/commands/owner/leave.js
new file mode 100644
index 000000000..1ced750b8
--- /dev/null
+++ b/commands/owner/leave.js
@@ -0,0 +1,39 @@
+module.exports = {
+    name: 'leave',
+    aliases: ['exit', 'leavegc'],
+    desc: 'Leave the current group',
+    category: 'owner',
+
+    groupOnly: true,
+    ownerOnly: true,
+
+    reactions: {
+        start: '👋',
+        success: '✅'
+    },
+
+    execute: async (sock, msg, args, {
+        from,
+        reply,
+        react
+    }) => {
+        try {
+            await react('👋');
+
+            if (args[0]?.toLowerCase() !== 'confirm') {
+                return reply(
+                    '⚠️ This will make me leave the group.\n\n' +
+                    'Run:\n.leave confirm'
+                );
+            }
+
+            await reply('👋 Goodbye!');
+
+            await sock.groupLeave(from);
+
+        } catch (err) {
+            console.error(err);
+            reply(`❌ ${err.message}`);
+        }
+    }
+};
diff --git a/commands/owner/setbio.js b/commands/owner/setbio.js
new file mode 100644
index 000000000..d613bf2fc
--- /dev/null
+++ b/commands/owner/setbio.js
@@ -0,0 +1,36 @@
+module.exports = {
+    name: 'setbio',
+    aliases: ['setabout', 'bio'],
+    category: 'owner',
+    description: 'Change the bot WhatsApp bio',
+    usage: 'setbio <new bio>',
+    ownerOnly: true,
+    reactions: {
+        start: '📝',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, args, { reply }) => {
+        try {
+            if (!args.length) {
+                return reply(
+                    `❌ Please provide a new bio.\n\nExample:\n.setbio Online 24/7 🤖`
+                );
+            }
+
+            const newBio = args.join(' ').trim();
+
+            if (newBio.length > 139) {
+                return reply('❌ Bio cannot be longer than 139 characters.');
+            }
+
+            await sock.updateProfileStatus(newBio);
+
+            return reply(`✅ Bot bio has been updated.\n\n📝 *New Bio:*\n${newBio}`);
+        } catch (err) {
+            console.error(err);
+            return reply('❌ Failed to update the bot bio.');
+        }
+    }
+};
diff --git a/commands/owner/setponame.js b/commands/owner/setponame.js
new file mode 100644
index 000000000..a55e03a3a
--- /dev/null
+++ b/commands/owner/setponame.js
@@ -0,0 +1,32 @@
+module.exports = {
+    name: 'setprofilename',
+    aliases: ['setppname', 'profilename', 'name'],
+    category: 'owner',
+    desc: 'Change the bot profile name',
+    usage: 'setprofilename <new name>',
+    ownerOnly: true,
+    reactions: {
+        start: '✏️',
+        success: '✅',
+        error: '❌'
+    },
+
+    execute: async (sock, msg, { args, reply }) => {
+        try {
+            if (!args.length) {
+                return reply(
+                    '❌ Please provide a new profile name.\n\nExample:\n.setprofilename KnightBot'
+                );
+            }
+
+            const name = args.join(' ').trim();
+
+            await sock.updateProfileName(name);
+
+            reply(`✅ Profile name updated to *${name}*`);
+        } catch (err) {
+            console.error(err);
+            reply('❌ Failed to update profile name.');
+        }
+    }
+};
diff --git a/commands/textmaker/bp.js b/commands/textmaker/bp.js
new file mode 100644
index 000000000..f416cea3c
--- /dev/null
+++ b/commands/textmaker/bp.js
@@ -0,0 +1,48 @@
+/**
+ * BLACKPINK Text Effect
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'blackpink',
+  aliases: ['bp', 'bplogo'],
+  category: 'textmaker',
+  description: 'Create a BLACKPINK style logo',
+  usage: '.blackpink <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .blackpink KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/online-blackpink-style-logo-maker-effect-711.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `🖤💗 BLACKPINK Logo\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in blackpink command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/glass.js b/commands/textmaker/glass.js
new file mode 100644
index 000000000..325190ef2
--- /dev/null
+++ b/commands/textmaker/glass.js
@@ -0,0 +1,48 @@
+/**
+ * Wet Glass Text Effect
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'wetglass',
+  aliases: ['glass', 'rainglass'],
+  category: 'textmaker',
+  description: 'Create a wet glass text effect',
+  usage: '.wetglass <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .wetglass KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/write-text-on-wet-glass-online-589.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received from Ephoto360.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `💧 *Wet Glass Effect*\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in wetglass command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/graffiti.js b/commands/textmaker/graffiti.js
new file mode 100644
index 000000000..069dab32b
--- /dev/null
+++ b/commands/textmaker/graffiti.js
@@ -0,0 +1,48 @@
+/**
+ * Graffiti Text Effect
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'graffiti',
+  aliases: ['graff', 'spray'],
+  category: 'textmaker',
+  description: 'Create a graffiti text effect',
+  usage: '.graffiti <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .graffiti KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/graffiti-text-text-effect-online-178.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received from Ephoto360.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `🎨 *Graffiti Text*\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in graffiti command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/naruto.js b/commands/textmaker/naruto.js
new file mode 100644
index 000000000..638b5a542
--- /dev/null
+++ b/commands/textmaker/naruto.js
@@ -0,0 +1,48 @@
+/**
+ * Naruto Shippuden Logo
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'naruto',
+  aliases: ['narutologo', 'shippuden'],
+  category: 'textmaker',
+  description: 'Create a Naruto Shippuden style logo',
+  usage: '.naruto <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .naruto KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/naruto-shippuden-logo-style-text-effect-online-808.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received from Ephoto360.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `🍥 *Naruto Shippuden Logo*\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in naruto command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/neonglitch.js b/commands/textmaker/neonglitch.js
new file mode 100644
index 000000000..138f467cf
--- /dev/null
+++ b/commands/textmaker/neonglitch.js
@@ -0,0 +1,48 @@
+/**
+ * Neon Glitch Text Effect
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'neonglitch',
+  aliases: ['nglitch', 'neon'],
+  category: 'textmaker',
+  description: 'Create a neon glitch text effect',
+  usage: '.neonglitch <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .neonglitch KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/create-impressive-neon-glitch-text-effects-online-768.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received from Ephoto360.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `⚡ *Neon Glitch Effect*\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in neonglitch command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/ph.js b/commands/textmaker/ph.js
new file mode 100644
index 000000000..f12e18b7a
--- /dev/null
+++ b/commands/textmaker/ph.js
@@ -0,0 +1,60 @@
+/**
+ * PornHub Style Logo
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'pornhub',
+  aliases: ['phlogo', 'ph'],
+  category: 'textmaker',
+  description: 'Create a PornHub-style logo',
+  usage: '.pornhub <left text>|<right text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const chatId = msg.key.remoteJid;
+      const input = args.join(' ');
+
+      if (!input.includes('|')) {
+        return await sock.sendMessage(chatId, {
+          text:
+`Please provide two texts separated by "|"
+
+Example:
+.pornhub Knight|Bot`
+        }, { quoted: msg });
+      }
+
+      const [left, right] = input.split('|').map(v => v.trim());
+
+      if (!left || !right) {
+        return await sock.sendMessage(chatId, {
+          text: 'Both texts are required.\n\nExample:\n.pornhub Knight|Bot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/create-pornhub-style-logos-online-free-549.html',
+        [left, right]
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `🟧⬛ *PornHub Style Logo*\n\n📝 ${left} | ${right}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in pornhub command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/textmaker/typography.js b/commands/textmaker/typography.js
new file mode 100644
index 000000000..731c8f958
--- /dev/null
+++ b/commands/textmaker/typography.js
@@ -0,0 +1,48 @@
+/**
+ * Typography Art Effect
+ */
+
+const mumaker = require('mumaker');
+const config = require('../../config');
+
+module.exports = {
+  name: 'typography',
+  aliases: ['typo', 'layers'],
+  category: 'textmaker',
+  description: 'Create a multi-layer typography art effect',
+  usage: '.typography <text>',
+
+  async execute(sock, msg, args) {
+    try {
+      const text = args.join(' ');
+      const chatId = msg.key.remoteJid;
+
+      if (!text) {
+        return await sock.sendMessage(chatId, {
+          text: 'Please provide text.\nExample: .typography KnightBot'
+        }, { quoted: msg });
+      }
+
+      const result = await mumaker.ephoto(
+        'https://en.ephoto360.com/create-online-typography-art-effects-with-multiple-layers-811.html',
+        text
+      );
+
+      if (!result || !result.image) {
+        throw new Error('No image URL received from Ephoto360.');
+      }
+
+      await sock.sendMessage(chatId, {
+        image: { url: result.image },
+        caption: `🎨 *Typography Art*\n\n📝 Text: ${text}\n\n> Generated by ${config.botName}`
+      }, { quoted: msg });
+
+    } catch (error) {
+      console.error('Error in typography command:', error);
+
+      await sock.sendMessage(msg.key.remoteJid, {
+        text: `❌ Error: ${error.message}`
+      }, { quoted: msg });
+    }
+  }
+};
diff --git a/commands/utility/shorten.js b/commands/utility/shorten.js
new file mode 100644
index 000000000..928600f24
--- /dev/null
+++ b/commands/utility/shorten.js
@@ -0,0 +1,65 @@
+const axios = require("axios");
+
+module.exports = {
+  name: "tinyurl",
+  aliases: ["surl", "tiny"],
+  category: "utility",
+  description: "Shorten a long URL using TinyURL.",
+  usage: "<url>",
+
+  async execute(sock, m, args) {
+    try {
+      const url = args.join(" ").trim();
+
+      if (!url) {
+        return sock.sendMessage(
+          m.key.remoteJid,
+          {
+            text: "❌ Please provide a URL.\n\nExample:\n.tinyurl https://example.com"
+          },
+          { quoted: m }
+        );
+      }
+
+      const api = `https://api.princetechn.com/api/tools/tinyurl?apikey=prince&url=${encodeURIComponent(url)}`;
+      const { data } = await axios.get(api);
+
+      if (!data.success) {
+        return sock.sendMessage(
+          m.key.remoteJid,
+          {
+            text: "❌ Failed to shorten the URL. Please try again later."
+          },
+          { quoted: m }
+        );
+      }
+
+      const msg = `✨ *Your link is ready!* ✨
+
+🔗 *Original URL:*
+${url}
+
+🌸 *TinyURL:*
+${data.result}
+
+💖 Short, sweet, and ready to share!`;
+
+      await sock.sendMessage(
+        m.key.remoteJid,
+        {
+          text: msg
+        },
+        { quoted: m }
+      );
+    } catch (err) {
+      console.error(err);
+      await sock.sendMessage(
+        m.key.remoteJid,
+        {
+          text: "❌ Something went wrong while shortening your link."
+        },
+        { quoted: m }
+      );
+    }
+  }
+};
diff --git a/config.js b/config.js
index e4d2f072a..96ef9752d 100644
--- a/config.js
+++ b/config.js
@@ -4,44 +4,44 @@
 
 module.exports = {
     // Bot Owner Configuration
-    ownerNumber: ['9876543210'], // Add your number without + or spaces (e.g., 919876543210)
-    ownerName: ['Knight Bot'], // Owner names corresponding to ownerNumber array
+    ownerNumber: ['27799400929'], // Add your number without + or spaces (e.g., 919876543210)
+    ownerName: ["LA'SAINT"], // Owner names corresponding to ownerNumber array
     
     // Bot Configuration
-    botName: 'Knight Bot Mini',
-    prefix: ',',
+    botName: 'Founder MD',
+    prefix: '.',
     sessionName: 'session',
-    sessionID: process.env.SESSION_ID || '',
+    sessionID: process.env.SESSION_ID || 'KnightBot!H4sIAAAAAAAAA5VUTZOiSBD9Kxt11RgFFZCIjhhEQUAQFRt1Yw4lFFDyKVWAOOF/n8Cenp7D7mzvrSqhXr7M9zK/gyzHBBmoBeJ3UJS4hhR1R9oWCIhgVgUBKkEf+JBCIAJD38yNXsvQ0dgeDWlp3Ops2LOD85QN1rmu8sX9Ks2SpM7iF/Dog6I6J9j7AyCbBxiuhSNMmfNoGmEOt5OD4F78XaP1NE4ZcVpaH1XmrnSAHSLEJc7CRRGhFJUwMVBrQ1x+jv5O43jTIYusHJZzHe5dtWbD85RFuTY2HbN2dtPrLA0ya3j8HP353T4kmhs5arpIX6UBsmZVW5xc+zRv1sl+zHM33qxj22/CN/oEhxnyNR9lFNP2033fm0u+gcnMF5oIC9Fuh4LJmJktj7Jzz2qNMehEzaaLZJ+FnyN+sbi5VifQTReRIxh7yAz8yKt4deLRQCfZWl67BatVmZr/Ttwu370S/5++X7UL1ee7SdKo8OY469VxasRlfuIchRe0EO6oXeXJ1t2zn6QvSJXpE7W3txvb8Z15b2Sbo3h+vubWdWuWq6GajCeKvrptvQ/6kFbln1gKB7mO0iZKb4dXNLqPx6anbBeylvPRMaji+BSuYC9tBpso2Vx62dC0Xq/NaSZXVRu/2oqi3gfY3VRjF7aK4C7zlHU34eblWVGMWs0HIvPogxKFmNASUpxnXYyf9gH06x3ySkSf3QUnZa1KBkfJYuWjHrEYm+jF8qjgSuXnjRabwxOa2Tx7lKQX0AdFmXuIEOQvMaF52ZqIEBgiAsS/v/VBhm70Tbcu24jpgwCXhO6zqkhy6L+L+v4Rel5eZXTXZp7cHVAJxOFHGFGKs5B0bawyWHoRrpEcQUqAGMCEoF8FohL5QKRlhX4NrZz7z77r6mlmjATQB+lTD+x3m4AX2PGQHwncVGS/ki9NBwqL4kuGKOiDDHb/Ain5i9BOs+Tt0ZQdcRNhOBGmHM+I7Ncu/PjFtgP3EYU4IUAEstFzrydtsbDgpPJNVZUWoSSHEvio7t0lbzKsdaNoZ74SHe8xtNb6NBa0cWIFp3Vp9eT4BrlKrptKk3bHl38AASJweHy/cGXU7C9mtJLq/GLVWTNjX+e1JwWDcDDfmkrWrkIYbpbesuHvkIzlO7NiPFdf9hjVWEVGWstMeoT6+WDwUnyVOkv1gY9q7KHfky2MnhqnRIls6wSVtTVVttXQLPhtPPC9S022w6s7x4MNTmTIxyM9T2+MMve0u6c1FlxpYzewHW5T3wovFnKYq/qrETVv/n3OT/Jzb+GntTrdumuA0XMN/FToP3R8o92Zbfjo/4bwc638y2jOHLy7euFhe3TNiXpxcHCy5bXuHFjneg/CwnSrMiyFFZYWKXg8vvVBkUAa5GUKREDSMwZ9UOZVZ10tC/I/ZJIlU5OlcNUVnUBCpY9xcHCKCIVpAUSGFyYcw3Ps9PEDUq0ljUMHAAA=',
     newsletterJid: '120363161513685998@newsletter', // Newsletter JID for menu forwarding
     updateZipUrl: 'https://github.com/mruniquehacker/KnightBot-Mini/archive/refs/heads/main.zip', // URL to latest code zip for .update command
     
     // Sticker Configuration
-    packname: 'Knight Bot',
+    packname: 'Founder MD',
     
     // Bot Behavior
     selfMode: false, // Private mode - only owner can use commands
-    autoRead: false,
-    autoTyping: false,
+    autoRead: true,
+    autoTyping: true,
     autoBio: false,
     autoSticker: false,
     autoReact: false,
     autoReactMode: 'bot',
-    autoDownload: false,
+    autoDownload: true,
     
     // Group Settings Defaults
     defaultGroupSettings: {
-      antilink: false,
-      antilinkAction: 'delete', // 'delete', 'kick', 'warn'
+      antilink: true,
+      antilinkAction: 'kick', // 'delete', 'kick', 'warn'
       antitag: false,
       antitagAction: 'delete',
-      antiall: false, // Owner only - blocks all messages from non-admins
-      antiviewonce: false,
+      antiall: true, // Owner only - blocks all messages from non-admins
+      antiviewonce: true,
       antibot: false,
       antibotAction: 'warn', // 'warn' | 'kick'
-      anticall: false, // Anti-call feature
+      anticall: true, // Anti-call feature
       antigroupmention: false, // Anti-group mention feature
       antigroupmentionAction: 'delete', // 'delete', 'kick'
-      antigroupstatus: false, // Block group status posts
+      antigroupstatus: true, // Block group status posts
       antigroupstatusAction: 'delete', // 'delete', 'kick'
       antisticker: false, // Stickers not allowed in group
       antistickerAction: 'delete', // 'delete', 'kick'
@@ -93,4 +93,3 @@ module.exports = {
       youtube: 'http://youtube.com/@mr_unique_hacker'
     }
 };
-  
\ No newline at end of file
diff --git a/handler.js b/handler.js
index 9f1638095..49e774cf2 100644
--- a/handler.js
+++ b/handler.js
@@ -1727,4 +1727,4 @@ module.exports = {
   isMod,
   getGroupMetadata,
   findParticipant
-};
\ No newline at end of file
+};
diff --git a/handler.txt b/handler.txt
new file mode 100644
index 000000000..f570218b5
--- /dev/null
+++ b/handler.txt
@@ -0,0 +1,1746 @@
+/**
+ * Message Handler - Processes incoming messages and executes commands
+ */
+const autoDownload = require('./utils/autodownload');
+const config = require('./config');
+const database = require('./database');
+const { loadCommands } = require('./utils/commandLoader');
+const { addMessage } = require('./utils/groupstats');
+const { tryAutoLevelUp, formatLevelUpMessage } = require('./utils/economy');
+const { jidDecode, jidEncode } = require('@whiskeysockets/baileys');
+const fs = require('fs');
+const path = require('path');
+const axios = require('axios');
+const chatbotCmd = require('./commands/admin/chatbot');
+const { containsBadWord } = require('./utils/badwords');
+const { writeExifImg } = require('./utils/exif');
+
+// Group metadata cache to prevent rate limiting
+const groupMetadataCache = new Map();
+const CACHE_TTL = 60000; // 1 minute cache
+
+// Load all commands
+const commands = loadCommands();
+
+const ANTIBADWORD_STICKER_PATH = path.join(__dirname, 'utils', 'galimatde.webp');
+const ANTIBADWORD_STICKER_AUTHOR = 'GALI MAT DE BSDK';
+let antibadwordStickerCache = null;
+
+const getAntibadwordSticker = async () => {
+  try {
+    if (!antibadwordStickerCache && fs.existsSync(ANTIBADWORD_STICKER_PATH)) {
+      const raw = fs.readFileSync(ANTIBADWORD_STICKER_PATH);
+      antibadwordStickerCache = await writeExifImg(raw, { packname: ANTIBADWORD_STICKER_AUTHOR });
+    }
+  } catch (e) {
+    console.error('[antibadword] sticker load error:', e.message);
+  }
+  return antibadwordStickerCache;
+};
+
+// Unwrap WhatsApp containers (ephemeral, view once, etc.)
+const getMessageContent = (msg) => {
+  if (!msg || !msg.message) return null;
+  
+  let m = msg.message;
+  
+  // Common wrappers in modern WhatsApp
+  if (m.ephemeralMessage) m = m.ephemeralMessage.message;
+  if (m.viewOnceMessageV2) m = m.viewOnceMessageV2.message;
+  if (m.viewOnceMessage) m = m.viewOnceMessage.message;
+  if (m.documentWithCaptionMessage) m = m.documentWithCaptionMessage.message;
+  
+  // You can add more wrappers if needed later
+  return m;
+};
+
+// Cached group metadata getter with rate limit handling (for non-admin checks)
+const getCachedGroupMetadata = async (sock, groupId) => {
+  try {
+    // Validate group JID before attempting to fetch
+    if (!groupId || !groupId.endsWith('@g.us')) {
+      return null;
+    }
+    
+    // Check cache first
+    const cached = groupMetadataCache.get(groupId);
+    if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
+      return cached.data; // Return cached data (even if null for forbidden groups)
+    }
+    
+    // Fetch from API
+    const metadata = await sock.groupMetadata(groupId);
+    
+    // Cache it
+    groupMetadataCache.set(groupId, {
+      data: metadata,
+      timestamp: Date.now()
+    });
+    
+    return metadata;
+  } catch (error) {
+    // Handle forbidden (403) errors - cache null to prevent retry storms
+    if (error.message && (
+      error.message.includes('forbidden') || 
+      error.message.includes('403') ||
+      error.statusCode === 403 ||
+      error.output?.statusCode === 403 ||
+      error.data === 403
+    )) {
+      // Cache null for forbidden groups to prevent repeated attempts
+      groupMetadataCache.set(groupId, {
+        data: null,
+        timestamp: Date.now()
+      });
+      return null; // Silently return null for forbidden groups
+    }
+    
+    // Handle rate limit errors
+    if (error.message && error.message.includes('rate-overlimit')) {
+      const cached = groupMetadataCache.get(groupId);
+      if (cached) {
+        return cached.data;
+      }
+      return null;
+    }
+    
+    // For other errors, try cached data as fallback
+    const cached = groupMetadataCache.get(groupId);
+    if (cached) {
+      return cached.data;
+    }
+    
+    // Return null instead of throwing to prevent crashes
+    return null;
+  }
+};
+
+// Live group metadata getter (always fresh, no cache) - for admin checks
+const getLiveGroupMetadata = async (sock, groupId) => {
+  try {
+    // Always fetch fresh metadata, bypass cache
+    const metadata = await sock.groupMetadata(groupId);
+    
+    // Update cache for other features (antilink, welcome, etc.)
+    groupMetadataCache.set(groupId, {
+      data: metadata,
+      timestamp: Date.now()
+    });
+    
+    return metadata;
+  } catch (error) {
+    // On error, try cached data as fallback
+    const cached = groupMetadataCache.get(groupId);
+    if (cached) {
+      return cached.data;
+    }
+    return null;
+  }
+};
+
+// Alias for backward compatibility (non-admin features use cached)
+const getGroupMetadata = getCachedGroupMetadata;
+
+// Helper functions
+const isOwner = (sender) => {
+  if (!sender) return false;
+  
+  // Normalize sender JID to handle LID
+  const normalizedSender = normalizeJidWithLid(sender);
+  const senderNumber = normalizeJid(normalizedSender);
+  
+  // Check against owner numbers
+  return config.ownerNumber.some(owner => {
+    const normalizedOwner = normalizeJidWithLid(owner.includes('@') ? owner : `${owner}@s.whatsapp.net`);
+    const ownerNumber = normalizeJid(normalizedOwner);
+    return ownerNumber === senderNumber;
+  });
+};
+
+const isMod = (sender) => {
+  const number = sender.split('@')[0];
+  return database.isModerator(number);
+};
+
+// LID mapping cache
+const lidMappingCache = new Map();
+
+// Helper to normalize JID to just the number part
+const normalizeJid = (jid) => {
+  if (!jid) return null;
+  if (typeof jid !== 'string') return null;
+  
+  // Remove device ID if present (e.g., "1234567890:0@s.whatsapp.net" -> "1234567890")
+  if (jid.includes(':')) {
+    return jid.split(':')[0];
+  }
+  // Remove domain if present (e.g., "1234567890@s.whatsapp.net" -> "1234567890")
+  if (jid.includes('@')) {
+    return jid.split('@')[0];
+  }
+  return jid;
+};
+
+// Get LID mapping value from session files
+const getLidMappingValue = (user, direction) => {
+  if (!user) return null;
+  
+  const cacheKey = `${direction}:${user}`;
+  if (lidMappingCache.has(cacheKey)) {
+    return lidMappingCache.get(cacheKey);
+  }
+  
+  const sessionPath = path.join(__dirname, config.sessionName || 'session');
+  const suffix = direction === 'pnToLid' ? '.json' : '_reverse.json';
+  const filePath = path.join(sessionPath, `lid-mapping-${user}${suffix}`);
+  
+  if (!fs.existsSync(filePath)) {
+    lidMappingCache.set(cacheKey, null);
+    return null;
+  }
+  
+  try {
+    const raw = fs.readFileSync(filePath, 'utf8').trim();
+    const value = raw ? JSON.parse(raw) : null;
+    lidMappingCache.set(cacheKey, value || null);
+    return value || null;
+  } catch (error) {
+    lidMappingCache.set(cacheKey, null);
+    return null;
+  }
+};
+
+// Normalize JID handling LID conversion
+const normalizeJidWithLid = (jid) => {
+  if (!jid) return jid;
+  
+  try {
+    const decoded = jidDecode(jid);
+    if (!decoded?.user) {
+      return `${jid.split(':')[0].split('@')[0]}@s.whatsapp.net`;
+    }
+    
+    let user = decoded.user;
+    let server = decoded.server === 'c.us' ? 's.whatsapp.net' : decoded.server;
+    
+    const mapToPn = () => {
+      const pnUser = getLidMappingValue(user, 'lidToPn');
+      if (pnUser) {
+        user = pnUser;
+        server = server === 'hosted.lid' ? 'hosted' : 's.whatsapp.net';
+        return true;
+      }
+      return false;
+    };
+    
+    if (server === 'lid' || server === 'hosted.lid') {
+      mapToPn();
+    } else if (server === 's.whatsapp.net' || server === 'hosted') {
+      mapToPn();
+    }
+    
+    if (server === 'hosted') {
+      return jidEncode(user, 'hosted');
+    }
+    return jidEncode(user, 's.whatsapp.net');
+  } catch (error) {
+    return jid;
+  }
+};
+
+// Build comparable JID variants (PN + LID) for matching
+const buildComparableIds = (jid) => {
+  if (!jid) return [];
+  
+  try {
+    const decoded = jidDecode(jid);
+    if (!decoded?.user) {
+      return [normalizeJidWithLid(jid)].filter(Boolean);
+    }
+    
+    const variants = new Set();
+    const normalizedServer = decoded.server === 'c.us' ? 's.whatsapp.net' : decoded.server;
+    
+    variants.add(jidEncode(decoded.user, normalizedServer));
+    
+    const isPnServer = normalizedServer === 's.whatsapp.net' || normalizedServer === 'hosted';
+    const isLidServer = normalizedServer === 'lid' || normalizedServer === 'hosted.lid';
+    
+    if (isPnServer) {
+      const lidUser = getLidMappingValue(decoded.user, 'pnToLid');
+      if (lidUser) {
+        const lidServer = normalizedServer === 'hosted' ? 'hosted.lid' : 'lid';
+        variants.add(jidEncode(lidUser, lidServer));
+      }
+    } else if (isLidServer) {
+      const pnUser = getLidMappingValue(decoded.user, 'lidToPn');
+      if (pnUser) {
+        const pnServer = normalizedServer === 'hosted.lid' ? 'hosted' : 's.whatsapp.net';
+        variants.add(jidEncode(pnUser, pnServer));
+      }
+    }
+    
+    return Array.from(variants);
+  } catch (error) {
+    return [jid];
+  }
+};
+
+// Check if a JID belongs to the bot (handles PN/LID/device IDs)
+const isBotJid = (jid, sock) => {
+  if (!jid || !sock?.user) return false;
+  const botRefs = [sock.user.id, sock.user.lid].filter(Boolean);
+  const targetVariants = buildComparableIds(jid);
+  return botRefs.some(botRef =>
+    buildComparableIds(botRef).some(botVariant => targetVariants.includes(botVariant))
+  );
+};
+
+// Find participant by either PN JID or LID JID
+const findParticipant = (participants = [], userIds) => {
+  const targets = (Array.isArray(userIds) ? userIds : [userIds])
+    .filter(Boolean)
+    .flatMap(id => buildComparableIds(id));
+  
+  if (!targets.length) return null;
+  
+  return participants.find(participant => {
+    if (!participant) return false;
+    
+    const participantIds = [
+      participant.id,
+      participant.lid,
+      participant.userJid
+    ]
+      .filter(Boolean)
+      .flatMap(id => buildComparableIds(id));
+    
+    return participantIds.some(id => targets.includes(id));
+  }) || null;
+};
+
+const isAdmin = async (sock, participant, groupId, groupMetadata = null) => {
+  if (!participant) return false;
+  
+  // Early return for non-group JIDs (DMs) - prevents slow sock.groupMetadata() call
+  if (!groupId || !groupId.endsWith('@g.us')) {
+    return false;
+  }
+  
+  // Always fetch live metadata for admin checks
+  let liveMetadata = groupMetadata;
+  if (!liveMetadata || !liveMetadata.participants) {
+    if (groupId) {
+      liveMetadata = await getLiveGroupMetadata(sock, groupId);
+    } else {
+      return false;
+    }
+  }
+  
+  if (!liveMetadata || !liveMetadata.participants) return false;
+  
+  // Use findParticipant to handle LID matching
+  const foundParticipant = findParticipant(liveMetadata.participants, participant);
+  if (!foundParticipant) return false;
+  
+  return foundParticipant.admin === 'admin' || foundParticipant.admin === 'superadmin';
+};
+
+const isBotAdmin = async (sock, groupId, groupMetadata = null) => {
+  if (!sock.user || !groupId) return false;
+  
+  // Early return for non-group JIDs (DMs) - prevents slow sock.groupMetadata() call
+  if (!groupId.endsWith('@g.us')) {
+    return false;
+  }
+  
+  try {
+    // Get bot's JID - Baileys stores it in sock.user.id
+    const botId = sock.user.id;
+    const botLid = sock.user.lid;
+    
+    if (!botId) return false;
+    
+    // Prepare bot JIDs to check - findParticipant will normalize them via buildComparableIds
+    const botJids = [botId];
+    if (botLid) {
+      botJids.push(botLid);
+    }
+    
+    // ALWAYS fetch live metadata for bot admin checks (never use cached)
+    const liveMetadata = await getLiveGroupMetadata(sock, groupId);
+    
+    if (!liveMetadata || !liveMetadata.participants) return false;
+    
+    const participant = findParticipant(liveMetadata.participants, botJids);
+    if (!participant) return false;
+    
+    return participant.admin === 'admin' || participant.admin === 'superadmin';
+  } catch (error) {
+    return false;
+  }
+};
+
+const isUrl = (text) => {
+  const urlRegex = /(https?:\/\/[^\s]+)/gi;
+  return urlRegex.test(text);
+};
+
+const hasGroupLink = (text) => {
+  const linkRegex = /chat.whatsapp.com\/([0-9A-Za-z]{20,24})/i;
+  return linkRegex.test(text);
+};
+
+// System JID filter - checks if JID is from broadcast/status/newsletter
+const isSystemJid = (jid) => {
+  if (!jid) return true;
+  return jid.includes('@broadcast') || 
+         jid.includes('status.broadcast') || 
+         jid.includes('@newsletter') ||
+         jid.includes('@newsletter.');
+};
+
+// Main message handler
+const handleMessage = async (sock, msg) => {
+  try {
+    // Debug logging to see all messages
+    // Debug log removed
+    
+    if (!msg.message) return;
+    
+    const from = msg.key.remoteJid;
+    
+    // System message filter - ignore broadcast/status/newsletter messages
+    if (isSystemJid(from)) {
+      return; // Silently ignore system messages
+    }
+    
+    // Auto-React System
+    try {
+      // Clear cache to get fresh config values
+      delete require.cache[require.resolve('./config')];
+      const config = require('./config');
+
+      if (config.autoReact && msg.message && !msg.key.fromMe) {
+        const content = msg.message.ephemeralMessage?.message || msg.message;
+        const text =
+          content.conversation ||
+          content.extendedTextMessage?.text ||
+          '';
+
+        const jid = msg.key.remoteJid;
+        const emojis = ['❤️','🔥','👌','💀','😁','✨','👍','🤨','😎','😂','🤝','💫'];
+        
+        const mode = config.autoReactMode || 'bot';
+
+        if (mode === 'bot') {
+          const prefixList = ['.', '/', '#'];
+          if (prefixList.includes(text?.trim()[0])) {
+            await sock.sendMessage(jid, {
+              react: { text: '⏳', key: msg.key }
+            });
+          }
+        }
+
+        if (mode === 'all') {
+          const rand = emojis[Math.floor(Math.random() * emojis.length)];
+          await sock.sendMessage(jid, {
+            react: { text: rand, key: msg.key }
+          });
+        }
+      }
+    } catch (e) {
+      console.error('[AutoReact Error]', e.message);
+    }
+    
+    // Unwrap containers first
+    const content = getMessageContent(msg);
+    // Note: We don't return early if content is null because forwarded status messages might not have content
+    
+    // Still check for actual message content for regular processing
+    let actualMessageTypes = [];
+    if (content) {
+      const allKeys = Object.keys(content);
+      // Filter out protocol/system messages and find actual message content
+      const protocolMessages = ['protocolMessage', 'senderKeyDistributionMessage', 'messageContextInfo'];
+      actualMessageTypes = allKeys.filter(key => !protocolMessages.includes(key));
+    }
+    
+    // We'll check for empty content later after we've processed group messages
+    
+    // Use the first actual message type (conversation, extendedTextMessage, etc.)
+    const messageType = actualMessageTypes[0];
+    
+    // from already defined above in DM block check
+    const sender = msg.key.fromMe ? sock.user.id.split(':')[0] + '@s.whatsapp.net' : msg.key.participant || msg.key.remoteJid;
+    const isGroup = from.endsWith('@g.us'); // Should always be true now due to DM block above
+    
+    // Fetch group metadata immediately if it's a group
+    const groupMetadata = isGroup ? await getGroupMetadata(sock, from) : null;
+
+    // Anti-group status (block group status posts)
+    if (isGroup && !msg.key.fromMe) {
+      try {
+        const blocked = await handleAntigroupstatus(sock, msg, groupMetadata, content);
+        if (blocked) return;
+      } catch (error) {
+        console.error('Error in antigroupstatus handler:', error);
+      }
+    }
+
+    // Anti-sticker (block stickers from non-admins)
+    if (isGroup && !msg.key.fromMe) {
+      try {
+        const blocked = await handleAntisticker(sock, msg, groupMetadata, content);
+        if (blocked) return;
+      } catch (error) {
+        console.error('Error in antisticker handler:', error);
+      }
+    }
+    
+    // Anti-group mention protection (check BEFORE prefix check, as these are non-command messages)
+    if (isGroup) {
+      // Debug logging to confirm we're trying to call the handler
+      const groupSettings = database.getGroupSettings(from);
+      // Debug log removed
+      if (groupSettings.antigroupmention) {
+        // Debug log removed
+      }
+      try {
+        await handleAntigroupmention(sock, msg, groupMetadata);
+      } catch (error) {
+        console.error('Error in antigroupmention handler:', error);
+      }
+    }
+    
+    // Track group message statistics
+    if (isGroup) {
+      const ctx = content?.extendedTextMessage?.contextInfo;
+      addMessage(from, sender, {
+        mentions: ctx?.mentionedJid || [],
+        sticker: !!(content?.stickerMessage || msg.message?.stickerMessage),
+      });
+
+      // Auto level-up when enough XP (economy ranks)
+      if (!msg.key.fromMe) {
+        try {
+          const levelResult = tryAutoLevelUp(from, sender);
+          if (levelResult.leveled) {
+            await sock.sendMessage(from, {
+              text: formatLevelUpMessage(
+                levelResult.before,
+                levelResult.after,
+                levelResult.role,
+                levelResult.diamondsEarned
+              ),
+              mentions: [sender],
+            }, { quoted: msg });
+          }
+        } catch (e) {
+          // ignore autolevel errors
+        }
+      }
+    }
+    
+    // Return early for non-group messages with no recognizable content
+    if (!content || actualMessageTypes.length === 0) return;
+    
+    // 🔹 Button response should also check unwrapped content
+    const btn = content.buttonsResponseMessage || msg.message?.buttonsResponseMessage;
+    if (btn) {
+      const buttonId = btn.selectedButtonId;
+      const displayText = btn.selectedDisplayText;
+      
+      // Handle button clicks by routing to commands
+      if (buttonId === 'btn_menu') {
+        // Execute menu command
+        const menuCmd = commands.get('menu');
+        if (menuCmd) {
+          await menuCmd.execute(sock, msg, [], {
+            from,
+            sender,
+            isGroup,
+            groupMetadata,
+            isOwner: isOwner(sender),
+            isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+            isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+            isMod: isMod(sender),
+            reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+            react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+          });
+        }
+        return;
+      } else if (buttonId === 'btn_ping') {
+        // Execute ping command
+        const pingCmd = commands.get('ping');
+        if (pingCmd) {
+          await pingCmd.execute(sock, msg, [], {
+            from,
+            sender,
+            isGroup,
+            groupMetadata,
+            isOwner: isOwner(sender),
+            isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+            isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+            isMod: isMod(sender),
+            reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+            react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+          });
+        }
+        return;
+      } else if (buttonId === 'btn_help') {
+        // Execute list command again (help)
+        const listCmd = commands.get('list');
+        if (listCmd) {
+          await listCmd.execute(sock, msg, [], {
+            from,
+            sender,
+            isGroup,
+            groupMetadata,
+            isOwner: isOwner(sender),
+            isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+            isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+            isMod: isMod(sender),
+            reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+            react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+          });
+        }
+        return;
+      }
+    }
+    
+    // Get message body from unwrapped content
+    let body = '';
+    if (content.conversation) {
+      body = content.conversation;
+    } else if (content.extendedTextMessage) {
+      body = content.extendedTextMessage.text || '';
+    } else if (content.imageMessage) {
+      body = content.imageMessage.caption || '';
+    } else if (content.videoMessage) {
+      body = content.videoMessage.caption || '';
+    }
+    
+    body = (body || '').trim();
+    
+    // Check antiall protection (owner only feature)
+    if (isGroup) {
+      const groupSettings = database.getGroupSettings(from);
+      if (groupSettings.antiall) {
+        const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+        const senderIsOwner = isOwner(sender);
+        
+        if (!senderIsAdmin && !senderIsOwner) {
+          const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+          if (botIsAdmin) {
+            await sock.sendMessage(from, { delete: msg.key });
+            return;
+          }
+        }
+      }
+      
+      // Anti-tag protection (check BEFORE text check, as tagall can have no text)
+      if (groupSettings.antitag && !msg.key.fromMe) {
+        const ctx = content.extendedTextMessage?.contextInfo;
+        const mentionedJids = ctx?.mentionedJid || [];
+        
+        const messageText = (
+          body ||
+          content.imageMessage?.caption ||
+          content.videoMessage?.caption ||
+          ''
+        );
+        
+        const textMentions = messageText.match(/@[\d+\s\-()~.]+/g) || [];
+        const numericMentions = messageText.match(/@\d{10,}/g) || [];
+        
+        const uniqueNumericMentions = new Set();
+        numericMentions.forEach((mention) => {
+          const numMatch = mention.match(/@(\d+)/);
+          if (numMatch) uniqueNumericMentions.add(numMatch[1]);
+        });
+        
+        const mentionedJidCount = mentionedJids.length;
+        const numericMentionCount = uniqueNumericMentions.size;
+        const totalMentions = Math.max(mentionedJidCount, numericMentionCount);
+        
+        if (totalMentions >= 3) {
+          try {
+            const participants = groupMetadata.participants || [];
+            const mentionThreshold = Math.max(3, Math.ceil(participants.length * 0.5));
+            const hasManyNumericMentions = numericMentionCount >= 10 ||
+              (numericMentionCount >= 5 && numericMentionCount >= mentionThreshold);
+            
+            if (totalMentions >= mentionThreshold || hasManyNumericMentions) {
+              const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+              const senderIsOwner = isOwner(sender);
+              
+              if (!senderIsAdmin && !senderIsOwner) {
+                const action = (groupSettings.antitagAction || 'delete').toLowerCase();
+                
+                if (action === 'delete') {
+                  try {
+                    await sock.sendMessage(from, { delete: msg.key });
+                    await sock.sendMessage(from, { 
+                      text: '⚠️ *Tagall Detected!*',
+                      mentions: [sender]
+                    }, { quoted: msg });
+                  } catch (e) {
+                    console.error('Failed to delete tagall message:', e);
+                  }
+                } else if (action === 'kick') {
+                  try {
+                    await sock.sendMessage(from, { delete: msg.key });
+                  } catch (e) {
+                    console.error('Failed to delete tagall message:', e);
+                  }
+                  
+                  const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+                  if (botIsAdmin) {
+                    try {
+                      await sock.groupParticipantsUpdate(from, [sender], 'remove');
+                    } catch (e) {
+                      console.error('Failed to kick for antitag:', e);
+                    }
+                    const usernames = [`@${sender.split('@')[0]}`];
+                    await sock.sendMessage(from, {
+                      text: `🚫 *Antitag Detected!*\n\n${usernames.join(', ')} has been kicked for tagging all members.`,
+                      mentions: [sender],
+                    }, { quoted: msg });
+                  }
+                }
+                return;
+              }
+            }
+          } catch (e) {
+            console.error('Error during anti-tag enforcement:', e);
+          }
+        }
+      }
+
+      // Antibadword protection
+      if (groupSettings.antibadword && !msg.key.fromMe) {
+        const messageText = body || content.imageMessage?.caption || content.videoMessage?.caption || '';
+        if (messageText) {
+          try {
+            const blocked = await handleAntibadword(sock, msg, groupMetadata, messageText, sender);
+            if (blocked) return;
+          } catch (e) {
+            console.error('Error in antibadword handler:', e);
+          }
+        }
+      }
+    }
+    
+    // Anti-group mention protection (check BEFORE prefix check, as these are non-command messages)
+    if (isGroup) {
+      // Debug logging to confirm we're trying to call the handler
+      const groupSettings = database.getGroupSettings(from);
+      if (groupSettings.antigroupmention) {
+        // Debug log removed
+      }
+      try {
+        await handleAntigroupmention(sock, msg, groupMetadata);
+      } catch (error) {
+        console.error('Error in antigroupmention handler:', error);
+      }
+    }
+    
+    // AutoSticker feature - convert images/videos to stickers automatically
+    if (isGroup) { // Process all messages in groups (including bot's own messages)
+      const groupSettings = database.getGroupSettings(from);
+      if (groupSettings.autosticker) {
+        const mediaMessage = content?.imageMessage || content?.videoMessage;
+        
+        // Only process if it's an image or video (not documents)
+        if (mediaMessage) {
+          // Skip if message has a command prefix (let command handle it)
+          if (!body.startsWith(config.prefix)) {
+            try {
+              // Import sticker command logic
+              const stickerCmd = commands.get('sticker');
+              if (stickerCmd) {
+                // Execute sticker conversion silently
+                await stickerCmd.execute(sock, msg, [], {
+                  from,
+                  sender,
+                  isGroup,
+                  groupMetadata,
+                  isOwner: isOwner(sender),
+                  isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+                  isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+                  isMod: isMod(sender),
+                  reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+                  react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+                });
+                return; // Don't process as command after auto-converting
+              }
+            } catch (error) {
+              console.error('[AutoSticker Error]:', error);
+              // Continue to normal processing if autosticker fails
+            }
+          }
+        }
+      }
+    }
+
+     // Check for active bomb games (before prefix check)
+    try {
+      const bombModule = require('./commands/fun/bomb');
+      if (bombModule.gameState && bombModule.gameState.has(sender)) {
+        const bombCommand = commands.get('bomb');
+        if (bombCommand && bombCommand.execute) {
+          // User has active game, process input
+          await bombCommand.execute(sock, msg, [], {
+            from,
+            sender,
+            isGroup,
+            groupMetadata,
+            isOwner: isOwner(sender),
+            isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+            isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+            isMod: isMod(sender),
+            reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+            react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+          });
+          return; // Don't process as command
+        }
+      }
+    } catch (e) {
+      // Silently ignore if bomb command doesn't exist or has errors
+    }
+    
+    // Check for active tictactoe games (before prefix check)
+    try {
+      const tictactoeModule = require('./commands/fun/tictactoe');
+      if (tictactoeModule.handleTicTacToeMove) {
+        // Check if user is in an active game
+        const isInGame = Object.values(tictactoeModule.games || {}).some(room => 
+          room.id.startsWith('tictactoe') && 
+          [room.game.playerX, room.game.playerO].includes(sender) && 
+          room.state === 'PLAYING'
+        );
+        
+        if (isInGame) {
+          // User has active game, process input
+          const handled = await tictactoeModule.handleTicTacToeMove(sock, msg, {
+            from,
+            sender,
+            isGroup,
+            groupMetadata,
+            isOwner: isOwner(sender),
+            isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+            isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+            isMod: isMod(sender),
+            reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+            react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+          });
+          if (handled) return; // Don't process as command if move was handled
+        }
+      }
+    } catch (e) {
+      // Silently ignore if tictactoe command doesn't exist or has errors
+    }
+
+    try {
+      const { handleGameInput } = require('./utils/funGames');
+      const handled = await handleGameInput(sock, msg, {
+        from,
+        sender,
+        isGroup,
+        groupMetadata,
+        isOwner: isOwner(sender),
+        reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+      });
+      if (handled) return;
+    } catch (e) {
+      // ignore fun game handler errors
+    }
+
+    // AFK — one-time reply when owner is away (groups + DMs)
+    if (!msg.key.fromMe) {
+      const afk = require('./utils/afk');
+      if (afk.isEnabled() && !isOwner(sender)) {
+        let shouldHandleAfk = false;
+
+        if (!isGroup) {
+          // DM: any message from non-owner triggers AFK once
+          shouldHandleAfk = true;
+        } else {
+          const ctx = content.extendedTextMessage?.contextInfo
+            || content.imageMessage?.contextInfo
+            || content.videoMessage?.contextInfo
+            || content.stickerMessage?.contextInfo;
+          const mentionedJids = ctx?.mentionedJid || [];
+          const isMentioned = mentionedJids.some(jid => isBotJid(jid, sock));
+          const isReplyToBot = ctx?.participant && isBotJid(ctx.participant, sock);
+          shouldHandleAfk = (isMentioned || isReplyToBot) && !body.startsWith(config.prefix);
+        }
+
+        if (shouldHandleAfk) {
+          if (afk.shouldNotify(from, sender)) {
+            afk.markNotified(from, sender);
+            await sock.sendMessage(from, { text: afk.getMessage() }, { quoted: msg });
+          }
+          return;
+        }
+      }
+    }
+
+    // Chatbot — respond when bot is @mentioned or user replies to bot
+    if (!msg.key.fromMe && isGroup) {
+      const groupSettings = database.getGroupSettings(from);
+      if (groupSettings.chatbot) {
+        const ctx = content.extendedTextMessage?.contextInfo;
+        const mentionedJids = ctx?.mentionedJid || [];
+        const isMentioned = mentionedJids.some(jid => isBotJid(jid, sock));
+        const isReplyToBot = ctx?.participant && isBotJid(ctx.participant, sock);
+
+        if ((isMentioned || isReplyToBot) && !body.startsWith(config.prefix)) {
+          await chatbotCmd.handleChat(sock, msg, body, sender);
+          return;
+        }
+      }
+    }
+
+    //
+
+    // Auto Downloader
+if (!msg.key.fromMe && body) {
+    try {
+        const handled = await autoDownload(sock, msg, {
+            body,
+            from,
+            sender
+        });
+
+        if (handled) return;
+    } catch (e) {
+        console.error("[AUTO DOWNLOAD]", e);
+    }
+}
+
+// Check if message starts with prefix
+if (!body.startsWith(config.prefix)) return;
+    // Parse command
+    const args = body.slice(config.prefix.length).trim().split(/\s+/);
+    const commandName = args.shift().toLowerCase();
+    
+    // Get command
+    const command = commands.get(commandName);
+    if (!command) return;
+    
+    // Check self mode (private mode) - only owner can use commands
+    if (config.selfMode && !isOwner(sender)) {
+      return;
+    }
+    
+    // Permission checks
+    if (command.ownerOnly && !isOwner(sender)) {
+      return sock.sendMessage(from, { text: config.messages.ownerOnly }, { quoted: msg });
+    }
+    
+    if (command.modOnly && !isMod(sender) && !isOwner(sender)) {
+      return sock.sendMessage(from, { text: '🔒 This command is only for moderators!' }, { quoted: msg });
+    }
+    
+    if (command.groupOnly && !isGroup) {
+      return sock.sendMessage(from, { text: config.messages.groupOnly }, { quoted: msg });
+    }
+    
+    if (command.privateOnly && isGroup) {
+      return sock.sendMessage(from, { text: config.messages.privateOnly }, { quoted: msg });
+    }
+    
+    if (command.adminOnly && !(await isAdmin(sock, sender, from, groupMetadata)) && !isOwner(sender)) {
+      return sock.sendMessage(from, { text: config.messages.adminOnly }, { quoted: msg });
+    }
+    
+    if (command.botAdminNeeded) {
+      const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+      if (!botIsAdmin) {
+        return sock.sendMessage(from, { text: config.messages.botAdminNeeded }, { quoted: msg });
+      }
+    }
+    
+    // Auto-typing
+    if (config.autoTyping) {
+      await sock.sendPresenceUpdate('composing', from);
+    }
+    
+    // Execute command
+    console.log(`Executing command: ${commandName} from ${sender}`);
+    
+    await command.execute(sock, msg, args, {
+      from,
+      sender,
+      isGroup,
+      groupMetadata,
+      isOwner: isOwner(sender),
+      isAdmin: await isAdmin(sock, sender, from, groupMetadata),
+      isBotAdmin: await isBotAdmin(sock, from, groupMetadata),
+      isMod: isMod(sender),
+      reply: (text) => sock.sendMessage(from, { text }, { quoted: msg }),
+      react: (emoji) => sock.sendMessage(from, { react: { text: emoji, key: msg.key } })
+    });
+    
+  } catch (error) {
+    console.error('Error in message handler:', error);
+    
+    // Don't send error messages for rate limit errors
+    if (error.message && error.message.includes('rate-overlimit')) {
+      console.warn('⚠️ Rate limit reached. Skipping error message.');
+      return;
+    }
+    
+    try {
+      await sock.sendMessage(msg.key.remoteJid, { 
+        text: `${config.messages.error}\n\n${error.message}` 
+      }, { quoted: msg });
+    } catch (e) {
+      // Don't log rate limit errors when sending error messages
+      if (!e.message || !e.message.includes('rate-overlimit')) {
+        console.error('Error sending error message:', e);
+      }
+    }
+  }
+};
+
+// Group participant update handler
+const handleGroupUpdate = async (sock, update) => {
+  try {
+    const { id, participants, action } = update;
+    
+    // Validate group JID before processing
+    if (!id || !id.endsWith('@g.us')) {
+      return;
+    }
+    
+    const groupSettings = database.getGroupSettings(id);
+    
+    if (!groupSettings.welcome && !groupSettings.goodbye) return;
+    
+    const groupMetadata = await getGroupMetadata(sock, id);
+    if (!groupMetadata) return; // Skip if metadata unavailable (forbidden or error)
+    
+    // Helper to extract participant JID
+    const getParticipantJid = (participant) => {
+      if (typeof participant === 'string') {
+        return participant;
+      }
+      if (participant && participant.id) {
+        return participant.id;
+      }
+      if (participant && typeof participant === 'object') {
+        // Try to find JID in object
+        return participant.jid || participant.participant || null;
+      }
+      return null;
+    };
+    
+    for (const participant of participants) {
+      const participantJid = getParticipantJid(participant);
+      if (!participantJid) {
+        console.warn('Could not extract participant JID:', participant);
+        continue;
+      }
+      
+      const participantNumber = participantJid.split('@')[0];
+      
+      if (action === 'add' && groupSettings.welcome) {
+        try {
+          // Get user's display name - find participant using phoneNumber or JID
+          let displayName = participantNumber;
+          
+          // Try to find participant in group metadata
+          const participantInfo = groupMetadata.participants.find(p => {
+            const pId = p.id || p.jid || p.participant;
+            const pPhone = p.phoneNumber;
+            // Match by JID or phoneNumber
+            return pId === participantJid || 
+                   pId?.split('@')[0] === participantNumber ||
+                   pPhone === participantJid ||
+                   pPhone?.split('@')[0] === participantNumber;
+          });
+          
+          // Get phoneNumber JID to fetch contact name
+          let phoneJid = null;
+          if (participantInfo && participantInfo.phoneNumber) {
+            phoneJid = participantInfo.phoneNumber;
+          } else {
+            // Try to normalize participantJid to phoneNumber format
+            // If it's a LID, try to convert to phoneNumber
+            try {
+              const normalized = normalizeJidWithLid(participantJid);
+              if (normalized && normalized.includes('@s.whatsapp.net')) {
+                phoneJid = normalized;
+              }
+            } catch (e) {
+              // If normalization fails, try using participantJid directly if it's a valid JID
+              if (participantJid.includes('@s.whatsapp.net')) {
+                phoneJid = participantJid;
+              }
+            }
+          }
+          
+          // Try to get contact name from phoneNumber JID
+          if (phoneJid) {
+            try {
+              // Method 1: Try to get from contact store if available
+              if (sock.store && sock.store.contacts && sock.store.contacts[phoneJid]) {
+                const contact = sock.store.contacts[phoneJid];
+                if (contact.notify && contact.notify.trim() && !contact.notify.match(/^\d+$/)) {
+                  displayName = contact.notify.trim();
+                } else if (contact.name && contact.name.trim() && !contact.name.match(/^\d+$/)) {
+                  displayName = contact.name.trim();
+                }
+              }
+              
+              // Method 2: Try to fetch contact using onWhatsApp and then check store
+              if (displayName === participantNumber) {
+                try {
+                  await sock.onWhatsApp(phoneJid);
+                  
+                  // After onWhatsApp, check store again (might populate after check)
+                  if (sock.store && sock.store.contacts && sock.store.contacts[phoneJid]) {
+                    const contact = sock.store.contacts[phoneJid];
+                    if (contact.notify && contact.notify.trim() && !contact.notify.match(/^\d+$/)) {
+                      displayName = contact.notify.trim();
+                    }
+                  }
+                } catch (fetchError) {
+                  // Silently handle fetch errors
+                }
+              }
+            } catch (contactError) {
+              // Silently handle contact errors
+            }
+          }
+          
+          // Final fallback: use participantInfo.notify or name if available
+          if (displayName === participantNumber && participantInfo) {
+            if (participantInfo.notify && participantInfo.notify.trim() && !participantInfo.notify.match(/^\d+$/)) {
+              displayName = participantInfo.notify.trim();
+            } else if (participantInfo.name && participantInfo.name.trim() && !participantInfo.name.match(/^\d+$/)) {
+              displayName = participantInfo.name.trim();
+            }
+          }
+          
+          // Get user's profile picture URL
+          let profilePicUrl = '';
+          try {
+            profilePicUrl = await sock.profilePictureUrl(participantJid, 'image');
+          } catch (ppError) {
+            // If profile picture not available, use default avatar
+            profilePicUrl = 'https://img.pyrocdn.com/dbKUgahg.png';
+          }
+          
+          // Get group name and description
+          const groupName = groupMetadata.subject || 'the group';
+          const groupDesc = groupMetadata.desc || 'No description';
+          
+          // Get current time string
+          const now = new Date();
+          const timeString = now.toLocaleTimeString('en-US', { 
+            hour: '2-digit', 
+            minute: '2-digit',
+            hour12: true 
+          });
+          
+          // Create formatted welcome message
+          const welcomeMsg = `╭╼━≪•𝙽𝙴𝚆 𝙼𝙴𝙼𝙱𝙴𝚁•≫━╾╮\n┃𝚆𝙴𝙻𝙲𝙾𝙼𝙴: @${displayName} 👋\n┃Member count: #${groupMetadata.participants.length}\n┃𝚃𝙸𝙼𝙴: ${timeString}⏰\n╰━━━━━━━━━━━━━━━╯\n\n*@${displayName}* Welcome to *${groupName}*! 🎉\n*Group 𝙳𝙴𝚂𝙲𝚁𝙸𝙿𝚃𝙸𝙾𝙽*\n${groupDesc}\n\n> *ᴘᴏᴡᴇʀᴇᴅ ʙʏ ${config.botName}*`;
+          
+          // Construct API URL for welcome image
+          const apiUrl = `https://api.some-random-api.com/welcome/img/7/gaming4?type=join&textcolor=white&username=${encodeURIComponent(displayName)}&guildName=${encodeURIComponent(groupName)}&memberCount=${groupMetadata.participants.length}&avatar=${encodeURIComponent(profilePicUrl)}`;
+          
+          // Download the welcome image
+          const imageResponse = await axios.get(apiUrl, { responseType: 'arraybuffer' });
+          const imageBuffer = Buffer.from(imageResponse.data);
+          
+          // Send the welcome image with formatted caption
+          await sock.sendMessage(id, { 
+            image: imageBuffer,
+            caption: welcomeMsg,
+            mentions: [participantJid] 
+          });
+        } catch (welcomeError) {
+          // Fallback to text message if image generation fails
+          console.error('Welcome image error:', welcomeError);
+          let message = groupSettings.welcomeMessage || 'Welcome @user to @group! 👋\nEnjoy your stay!';
+          message = message.replace('@user', `@${participantNumber}`);
+          message = message.replace('@group', groupMetadata.subject || 'the group');
+          
+          await sock.sendMessage(id, { 
+            text: message, 
+            mentions: [participantJid] 
+          });
+        }
+      } else if (action === 'remove' && groupSettings.goodbye) {
+        try {
+          // Get user's display name - find participant using phoneNumber or JID
+          let displayName = participantNumber;
+          
+          // Try to find participant in group metadata (before they left)
+          const participantInfo = groupMetadata.participants.find(p => {
+            const pId = p.id || p.jid || p.participant;
+            const pPhone = p.phoneNumber;
+            // Match by JID or phoneNumber
+            return pId === participantJid || 
+                   pId?.split('@')[0] === participantNumber ||
+                   pPhone === participantJid ||
+                   pPhone?.split('@')[0] === participantNumber;
+          });
+          
+          // Get phoneNumber JID to fetch contact name
+          let phoneJid = null;
+          if (participantInfo && participantInfo.phoneNumber) {
+            phoneJid = participantInfo.phoneNumber;
+          } else {
+            // Try to normalize participantJid to phoneNumber format
+            try {
+              const normalized = normalizeJidWithLid(participantJid);
+              if (normalized && normalized.includes('@s.whatsapp.net')) {
+                phoneJid = normalized;
+              }
+            } catch (e) {
+              if (participantJid.includes('@s.whatsapp.net')) {
+                phoneJid = participantJid;
+              }
+            }
+          }
+          
+          // Try to get contact name from phoneNumber JID
+          if (phoneJid) {
+            try {
+              // Method 1: Try to get from contact store if available
+              if (sock.store && sock.store.contacts && sock.store.contacts[phoneJid]) {
+                const contact = sock.store.contacts[phoneJid];
+                if (contact.notify && contact.notify.trim() && !contact.notify.match(/^\d+$/)) {
+                  displayName = contact.notify.trim();
+                } else if (contact.name && contact.name.trim() && !contact.name.match(/^\d+$/)) {
+                  displayName = contact.name.trim();
+                }
+              }
+              
+              // Method 2: Try to fetch contact using onWhatsApp and then check store
+              if (displayName === participantNumber) {
+                try {
+                  await sock.onWhatsApp(phoneJid);
+                  
+                  // After onWhatsApp, check store again
+                  if (sock.store && sock.store.contacts && sock.store.contacts[phoneJid]) {
+                    const contact = sock.store.contacts[phoneJid];
+                    if (contact.notify && contact.notify.trim() && !contact.notify.match(/^\d+$/)) {
+                      displayName = contact.notify.trim();
+                    }
+                  }
+                } catch (fetchError) {
+                  // Silently handle fetch errors
+                }
+              }
+            } catch (contactError) {
+              // Silently handle contact errors
+            }
+          }
+          
+          // Final fallback: use participantInfo.notify or name if available
+          if (displayName === participantNumber && participantInfo) {
+            if (participantInfo.notify && participantInfo.notify.trim() && !participantInfo.notify.match(/^\d+$/)) {
+              displayName = participantInfo.notify.trim();
+            } else if (participantInfo.name && participantInfo.name.trim() && !participantInfo.name.match(/^\d+$/)) {
+              displayName = participantInfo.name.trim();
+            }
+          }
+          
+          // Get user's profile picture URL
+          let profilePicUrl = '';
+          try {
+            profilePicUrl = await sock.profilePictureUrl(participantJid, 'image');
+          } catch (ppError) {
+            // If profile picture not available, use default avatar
+            profilePicUrl = 'https://img.pyrocdn.com/dbKUgahg.png';
+          }
+          
+          // Get group name and description
+          const groupName = groupMetadata.subject || 'the group';
+          const groupDesc = groupMetadata.desc || 'No description';
+          
+          // Get current time string
+          const now = new Date();
+          const timeString = now.toLocaleTimeString('en-US', { 
+            hour: '2-digit', 
+            minute: '2-digit',
+            hour12: true 
+          });
+          
+          // Create simple goodbye message
+          const goodbyeMsg = `Goodbye @${displayName} 👋 We will never miss you!`;
+          
+          // Construct API URL for goodbye image (using leave type)
+          const apiUrl = `https://api.some-random-api.com/welcome/img/7/gaming4?type=leave&textcolor=white&username=${encodeURIComponent(displayName)}&guildName=${encodeURIComponent(groupName)}&memberCount=${groupMetadata.participants.length}&avatar=${encodeURIComponent(profilePicUrl)}`;
+          
+          // Download the goodbye image
+          const imageResponse = await axios.get(apiUrl, { responseType: 'arraybuffer' });
+          const imageBuffer = Buffer.from(imageResponse.data);
+          
+          // Send the goodbye image with caption
+          await sock.sendMessage(id, { 
+            image: imageBuffer,
+            caption: goodbyeMsg,
+            mentions: [participantJid] 
+          });
+        } catch (goodbyeError) {
+          // Fallback to simple goodbye message
+          console.error('Goodbye error:', goodbyeError);
+          const goodbyeMsg = `Goodbye @${participantNumber} 👋 We will never miss you! 💀`;
+          
+          await sock.sendMessage(id, { 
+            text: goodbyeMsg, 
+            mentions: [participantJid] 
+          });
+        }
+      }
+    }
+  } catch (error) {
+    // Silently handle forbidden errors and other group metadata errors
+    if (error.message && (
+      error.message.includes('forbidden') || 
+      error.message.includes('403') ||
+      error.statusCode === 403 ||
+      error.output?.statusCode === 403 ||
+      error.data === 403
+    )) {
+      // Silently skip forbidden groups
+      return;
+    }
+    // Only log non-forbidden errors
+    if (!error.message || !error.message.includes('forbidden')) {
+      console.error('Error handling group update:', error);
+    }
+  }
+};
+
+// Detect WhatsApp group status posts (groupStatusMessage / groupStatusMessageV2)
+const isGroupStatusPost = (msg, content) => {
+  const unwrapped = content || getMessageContent(msg);
+  return !!(
+    unwrapped?.groupStatusMessage ||
+    unwrapped?.groupStatusMessageV2 ||
+    msg.message?.groupStatusMessage ||
+    msg.message?.groupStatusMessageV2
+  );
+};
+
+// Anti-group status handler
+const handleAntigroupstatus = async (sock, msg, groupMetadata, content) => {
+  try {
+    const from = msg.key.remoteJid;
+    const sender = msg.key.participant || msg.key.remoteJid;
+
+    const groupSettings = database.getGroupSettings(from);
+    if (!groupSettings.antigroupstatus) return false;
+    if (!isGroupStatusPost(msg, content)) return false;
+
+    // TESTING: admins/owners not exempt — remove this block later
+    // const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+    // const senderIsOwner = isOwner(sender);
+    // if (senderIsAdmin || senderIsOwner) return false;
+
+    const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+    const action = (groupSettings.antigroupstatusAction || 'delete').toLowerCase();
+
+    try {
+      await sock.sendMessage(from, { delete: msg.key });
+    } catch (e) {
+      console.error('Failed to delete group status post:', e);
+    }
+
+    if (action === 'kick' && botIsAdmin) {
+      try {
+        await sock.groupParticipantsUpdate(from, [sender], 'remove');
+        await sock.sendMessage(from, {
+          text: '📵 *Anti Group Status!* @user was kicked for posting a group status.',
+          mentions: [sender]
+        }, { quoted: msg });
+      } catch (e) {
+        console.error('Failed to kick for antigroupstatus:', e);
+      }
+    } else {
+      try {
+        await sock.sendMessage(from, {
+          text: '📵 *Anti Group Status!* Group status removed.',
+          mentions: [sender]
+        }, { quoted: msg });
+      } catch (e) {
+        console.error('Failed to notify antigroupstatus:', e);
+      }
+    }
+
+    return true;
+  } catch (error) {
+    console.error('Error in antigroupstatus handler:', error);
+    return false;
+  }
+};
+
+// Antibadword handler
+const handleAntibadword = async (sock, msg, groupMetadata, userMessage, sender) => {
+  try {
+    const from = msg.key.remoteJid;
+    const groupSettings = database.getGroupSettings(from);
+    if (!groupSettings.antibadword) return false;
+    if (!containsBadWord(userMessage)) return false;
+
+    const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+    const senderIsOwner = isOwner(sender);
+    if (senderIsAdmin || senderIsOwner) return false;
+
+    const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+    if (!botIsAdmin) return false;
+
+    try {
+      await sock.sendMessage(from, { delete: msg.key });
+    } catch (e) {
+      console.error('Failed to delete badword message:', e);
+      return false;
+    }
+
+    const action = (groupSettings.antibadwordAction || 'delete').toLowerCase();
+    const maxWarnings = config.maxWarnings || 3;
+
+    if (action === 'kick') {
+      try {
+        await sock.groupParticipantsUpdate(from, [sender], 'remove');
+        await sock.sendMessage(from, {
+          text: '🚫 *Antibadword!* @user was kicked for using bad words.',
+          mentions: [sender],
+        }, { quoted: msg });
+      } catch (e) {
+        console.error('Failed to kick for antibadword:', e);
+      }
+    } else if (action === 'warn') {
+      const result = database.addWarning(from, sender, 'Bad words');
+      if (result.count >= maxWarnings) {
+        try {
+          await sock.groupParticipantsUpdate(from, [sender], 'remove');
+          database.clearWarnings(from, sender);
+          await sock.sendMessage(from, {
+            text: `🚫 *Antibadword!* @user was kicked after ${maxWarnings} warnings.`,
+            mentions: [sender],
+          }, { quoted: msg });
+        } catch (e) {
+          console.error('Failed to kick after antibadword warnings:', e);
+        }
+      } else {
+        await sock.sendMessage(from, {
+          text: `⚠️ *Antibadword!* @user warning ${result.count}/${maxWarnings} for bad words.`,
+          mentions: [sender],
+        }, { quoted: msg });
+      }
+    } else {
+      const sticker = await getAntibadwordSticker();
+      if (sticker) {
+        await sock.sendMessage(from, { sticker }, { quoted: msg });
+      }
+    }
+
+    return true;
+  } catch (error) {
+    console.error('Error in antibadword handler:', error);
+    return false;
+  }
+};
+
+// Antisticker handler
+const handleAntisticker = async (sock, msg, groupMetadata, content) => {
+  try {
+    const from = msg.key.remoteJid;
+    const sender = msg.key.participant || msg.key.remoteJid;
+
+    const groupSettings = database.getGroupSettings(from);
+    if (!groupSettings.antisticker) return false;
+
+    const unwrapped = content || getMessageContent(msg);
+    const isSticker = !!(unwrapped?.stickerMessage || msg.message?.stickerMessage);
+    if (!isSticker) return false;
+
+    const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+    const senderIsOwner = isOwner(sender);
+    if (senderIsAdmin || senderIsOwner) return false;
+
+    const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+    const action = (groupSettings.antistickerAction || 'delete').toLowerCase();
+
+    try {
+      await sock.sendMessage(from, { delete: msg.key });
+    } catch (e) {
+      console.error('Failed to delete sticker for antisticker:', e);
+    }
+
+    if (action === 'kick' && botIsAdmin) {
+      try {
+        await sock.groupParticipantsUpdate(from, [sender], 'remove');
+      } catch (e) {
+        console.error('Failed to kick for antisticker:', e);
+      }
+    }
+
+    return true;
+  } catch (error) {
+    console.error('Error in antisticker handler:', error);
+    return false;
+  }
+};
+
+// Antilink handler
+const handleAntilink = async (sock, msg, groupMetadata) => {
+  try {
+    const from = msg.key.remoteJid;
+    const sender = msg.key.participant || msg.key.remoteJid;
+    
+    const groupSettings = database.getGroupSettings(from);
+    if (!groupSettings.antilink) return;
+    
+    const body = msg.message?.conversation || 
+                  msg.message?.extendedTextMessage?.text || 
+                  msg.message?.imageMessage?.caption || 
+                  msg.message?.videoMessage?.caption || '';
+    
+    // Comprehensive link detection - matches links with or without protocols
+    // Matches: https://t.me/..., http://wa.me/..., t.me/..., wa.me/..., google.com, telegram.com, etc.
+    // Pattern breakdown:
+    // 1. (https?:\/\/)? - Optional http:// or https://
+    // 2. ([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]*\.)+[a-zA-Z]{2,} - Domain pattern (e.g., google.com, t.me)
+    // 3. (\/[^\s]*)? - Optional path after domain
+    const linkPattern = /(https?:\/\/)?([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]*\.)+[a-zA-Z]{2,}(\/[^\s]*)?/i;
+    
+    // Check for any links (with or without protocol)
+    if (linkPattern.test(body)) {
+              const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+      const senderIsOwner = isOwner(sender);
+      
+      if (senderIsAdmin || senderIsOwner) return;
+      
+      const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+      const action = (groupSettings.antilinkAction || 'delete').toLowerCase();
+      
+      if (action === 'kick' && botIsAdmin) {
+        try {
+          await sock.sendMessage(from, { delete: msg.key });
+          await sock.groupParticipantsUpdate(from, [sender], 'remove');
+          await sock.sendMessage(from, { 
+            text: `🔗 Anti-link triggered. Link removed.`,
+            mentions: [sender]
+          }, { quoted: msg });
+        } catch (e) {
+          console.error('Failed to kick for antilink:', e);
+        }
+      } else {
+        // Default: delete message
+        try {
+          await sock.sendMessage(from, { delete: msg.key });
+          await sock.sendMessage(from, { 
+            text: `🔗 Anti-link triggered. Link removed.`,
+            mentions: [sender]
+          }, { quoted: msg });
+        } catch (e) {
+          console.error('Failed to delete message for antilink:', e);
+        }
+      }
+    }
+  } catch (error) {
+    console.error('Error in antilink handler:', error);
+  }
+};
+
+
+// Anti-group mention handler
+const handleAntigroupmention = async (sock, msg, groupMetadata) => {
+  try {
+    const from = msg.key.remoteJid;
+    const sender = msg.key.participant || msg.key.remoteJid;
+    
+    const groupSettings = database.getGroupSettings(from);
+    
+    // Debug logging to confirm handler is being called
+    if (groupSettings.antigroupmention) {
+      // Debug log removed
+      // Log simplified message info instead of full structure to avoid huge logs
+      // Debug log removed
+    }
+    
+    if (!groupSettings.antigroupmention) return;
+    
+    // Check if this is a forwarded status message that mentions the group
+    // Comprehensive detection for various status mention message types
+    let isForwardedStatus = false;
+    
+    if (msg.message) {
+      // Direct checks for known status mention message types
+      isForwardedStatus = isForwardedStatus || !!msg.message.groupStatusMentionMessage;
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.protocolMessage && msg.message.protocolMessage.type === 25); // STATUS_MENTION_MESSAGE
+      
+      // Check for forwarded newsletter info in various message types
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.extendedTextMessage && msg.message.extendedTextMessage.contextInfo && 
+         msg.message.extendedTextMessage.contextInfo.forwardedNewsletterMessageInfo);
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.conversation && msg.message.contextInfo && 
+         msg.message.contextInfo.forwardedNewsletterMessageInfo);
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.imageMessage && msg.message.imageMessage.contextInfo && 
+         msg.message.imageMessage.contextInfo.forwardedNewsletterMessageInfo);
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.videoMessage && msg.message.videoMessage.contextInfo && 
+         msg.message.videoMessage.contextInfo.forwardedNewsletterMessageInfo);
+      isForwardedStatus = isForwardedStatus || 
+        (msg.message.contextInfo && msg.message.contextInfo.forwardedNewsletterMessageInfo);
+      
+      // Generic check for any forwarded message
+      if (msg.message.contextInfo) {
+        const ctx = msg.message.contextInfo;
+        isForwardedStatus = isForwardedStatus || !!ctx.isForwarded;
+        isForwardedStatus = isForwardedStatus || !!ctx.forwardingScore;
+        // Additional check for forwarded status specifically
+        isForwardedStatus = isForwardedStatus || !!ctx.quotedMessageTimestamp;
+      }
+      
+      // Additional checks for forwarded messages
+      if (msg.message.extendedTextMessage && msg.message.extendedTextMessage.contextInfo) {
+        const extCtx = msg.message.extendedTextMessage.contextInfo;
+        isForwardedStatus = isForwardedStatus || !!extCtx.isForwarded;
+        isForwardedStatus = isForwardedStatus || !!extCtx.forwardingScore;
+      }
+    }
+    
+    // Additional debug logging for detection
+    if (groupSettings.antigroupmention) {
+      // Debug log removed
+    }
+    
+    // Additional debug logging to help identify message structure
+    if (groupSettings.antigroupmention) {
+      // Debug log removed
+      // Debug log removed
+      if (msg.message) {
+        // Debug log removed
+        // Log specific message types that might indicate a forwarded status
+        if (msg.message.protocolMessage) {
+          // Debug log removed
+        }
+        if (msg.message.contextInfo) {
+          // Debug log removed
+        }
+        if (msg.message.extendedTextMessage && msg.message.extendedTextMessage.contextInfo) {
+          // Debug log removed
+        }
+      }
+    }
+    
+    // Debug logging for detection
+    if (groupSettings.antigroupmention) {
+      // Debug log removed
+    }
+    
+    if (isForwardedStatus) {
+      if (groupSettings.antigroupmention) {
+        // Process forwarded status message
+      }
+      
+      const senderIsAdmin = await isAdmin(sock, sender, from, groupMetadata);
+      const senderIsOwner = isOwner(sender);
+      
+      if (groupSettings.antigroupmention) {
+        // Debug log removed
+      }
+      
+      // Don't act on admins or owners
+      if (senderIsAdmin || senderIsOwner) return;
+      
+      const botIsAdmin = await isBotAdmin(sock, from, groupMetadata);
+      const action = (groupSettings.antigroupmentionAction || 'delete').toLowerCase();
+      
+      if (groupSettings.antigroupmention) {
+        // Debug log removed
+      }
+      
+      if (action === 'kick' && botIsAdmin) {
+        try {
+          if (groupSettings.antigroupmention) {
+            // Delete and kick user
+          }
+          await sock.sendMessage(from, { delete: msg.key });
+          await sock.groupParticipantsUpdate(from, [sender], 'remove');
+          // Silent removal
+        } catch (e) {
+          console.error('Failed to kick for antigroupmention:', e);
+        }
+      } else {
+        // Default: delete message
+        try {
+          if (groupSettings.antigroupmention) {
+            // Delete message
+          }
+          await sock.sendMessage(from, { delete: msg.key });
+          // Silent deletion
+        } catch (e) {
+          console.error('Failed to delete message for antigroupmention:', e);
+        }
+      }
+    } else if (groupSettings.antigroupmention) {
+      // Debug log removed
+    }
+  } catch (error) {
+    console.error('Error in antigroupmention handler:', error);
+  }
+};
+
+
+// Anti-call feature initializer
+const initializeAntiCall = (sock) => {
+  // Anti-call feature - reject and block incoming calls
+  sock.ev.on('call', async (calls) => {
+    try {
+      // Reload config to get fresh settings
+      delete require.cache[require.resolve('./config')];
+      const config = require('./config');
+      
+      if (!config.defaultGroupSettings.anticall) return;
+
+      for (const call of calls) {
+        if (call.status === 'offer') {
+          // Reject the call
+          await sock.rejectCall(call.id, call.from);
+
+          // Block the caller
+          await sock.updateBlockStatus(call.from, 'block');
+
+          // Notify user
+          await sock.sendMessage(call.from, {
+            text: '🚫 Calls are not allowed. You have been blocked.'
+          });
+        }
+      }
+    } catch (err) {
+      console.error('[ANTICALL ERROR]', err);
+    }
+  });
+};
+
+module.exports = {
+  handleMessage,
+  handleGroupUpdate,
+  handleAntilink,
+  handleAntibadword,
+  handleAntisticker,
+  handleAntigroupstatus,
+  handleAntigroupmention,
+  initializeAntiCall,
+  isOwner,
+  isAdmin,
+  isBotAdmin,
+  isMod,
+  getGroupMetadata,
+  findParticipant
+};
diff --git a/index.js b/index.js
index a9c75978f..aa3a63a7c 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,20 @@
 /**
  * WhatsApp MD Bot - Main Entry Point
  */
+
+// dummy code to hush render
+
+const http = require('http');
+
+const server = http.createServer((req, res) => {
+  res.writeHead(200, { 'Content-Type': 'text/plain' });
+  res.end('Hello from HTTP server!');
+});
+
+server.listen(3000, () => {
+  console.log('Server running on http://localhost:3000');
+});
+
 process.env.PUPPETEER_SKIP_DOWNLOAD = 'true';
 process.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = 'true';
 process.env.PUPPETEER_CACHE_DIR = process.env.PUPPETEER_CACHE_DIR || '/tmp/puppeteer_cache_disabled';
@@ -498,4 +512,4 @@ process.on('unhandledRejection', (err) => {
   console.error('Unhandled Rejection:', err);
 });
 // Export store for use in commands
-module.exports = { store };
\ No newline at end of file
+module.exports = { store };
diff --git a/package.json b/package.json
index 854213ce4..5d5abbfa2 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,9 @@
         "@vitalets/google-translate-api": "^9.2.1",
         "@whiskeysockets/baileys": "^v7.0.0-rc.9",
         "axios": "^1.7.2",
+        
         "canvas": "^3.2.1",
+        "@rodrigogs/xvideos": "^3.1.0",
         "cheerio": "^1.0.0-rc.12",
         "ffmpeg-static": "^5.3.0",
         "fg-senna": "^0.0.7",
diff --git a/utils/IMG_5287.jpeg b/utils/IMG_5287.jpeg
new file mode 100644
index 000000000..c577c37c6
Binary files /dev/null and b/utils/IMG_5287.jpeg differ
diff --git a/utils/bot_image.jpg b/utils/bot_image.jpg
deleted file mode 100644
index bf188a4d9..000000000
Binary files a/utils/bot_image.jpg and /dev/null differ
diff --git a/utils/funCommands.jsxn b/utils/funCommands.jsxn
new file mode 100644
index 000000000..41d172ec8
--- /dev/null
+++ b/utils/funCommands.jsxn
@@ -0,0 +1,589 @@
+const APIs = require('./api');
+const { getStats, getWeeklyStats, rankUsers } = require('./groupstats');
+const { gameCommands } = require('./funGames');
+const {
+  tag,
+  pick,
+  percentFromId,
+  percentFromPair,
+  getTargetUser,
+  getTwoUsers,
+  getUserName,
+  askFunAi,
+  sendMention,
+  createRateCommand,
+  createPairRateCommand,
+  createPairCommand,
+  createRandomCommand,
+  createActionCommand,
+} = require('./funHelpers');
+
+const FORTUNES = [
+  'A surprise message will make your day.',
+  'Your next argument will be legendary.',
+  'Someone is thinking about you... probably the bot.',
+  'Good luck is coming. Bad luck is already here.',
+  'Today is perfect for starting drama.',
+];
+const HOROSCOPES = [
+  'Stars say: stop texting your ex.',
+  'Mercury is in retrograde. Blame everything on that.',
+  'Today you will be extremely online.',
+  'Cosmic energy: chaotic neutral.',
+  'The universe wants you to touch grass.',
+];
+const MOODS = ['😎 Cool', '😴 Sleepy', '🤡 Clown', '😤 Angry', '🥰 Soft', '💀 Dead inside', '🔥 Unhinged'];
+const PROFESSIONS = [
+  'Professional overthinker',
+  'Certified group lurker',
+  'Full-time drama starter',
+  'Part-time meme dealer',
+  'CEO of being late',
+  'Freelance simp',
+];
+const CHARACTERS = [
+  'Naruto (talks big, delivers sometimes)',
+  'Gojo (too cool for this group)',
+  'Light Yagami (planning something)',
+  'Doraemon (has gadgets, no common sense)',
+  'Shinchan (pure chaos)',
+  'Vegeta (angry 24/7)',
+];
+const FACTS = [
+  'Honey never spoils. Unlike this group chat.',
+  'Octopuses have three hearts. You have zero chill.',
+  'Bananas are berries. Strawberries are not. Life is a lie.',
+  'A group chat can survive anything except someone leaving without drama.',
+];
+const LOCAL_QUOTES = [
+  'Silence is golden unless you have something savage to say.',
+  'Not all heroes wear capes. Some send memes at 3 AM.',
+  'Group chat: where productivity goes to die beautifully.',
+];
+
+const rateCommands = [
+  createRateCommand('iqrate', ['iq'], {
+    description: 'Rate someone\'s IQ',
+    usage: '.iqrate @user',
+    salt: 1,
+    lines: (p, t) => [
+      `${t} IQ: *${p}* 🧠${p < 30 ? ' — room temperature IQ' : p > 80 ? ' — big brain energy' : ' — average legend'}`,
+      `Brain cells detected in ${t}: *${p}%*`,
+    ],
+  }),
+  createRateCommand('rizzrate', ['rizz'], {
+    description: 'Rate someone\'s rizz',
+    usage: '.rizzrate @user',
+    salt: 2,
+    lines: (p, t) => [
+      `${t} Rizz Level: *${p}%* 💫${p > 70 ? ' — dangerous' : p < 20 ? ' — rizzless behavior' : ''}`,
+      `${t} smoothness index: *${p}/100*`,
+    ],
+  }),
+  createRateCommand('simprate', ['simp'], {
+    description: 'Rate how much someone simps',
+    usage: '.simprate @user',
+    salt: 3,
+    lines: (p, t) => [
+      `${t} Simp Meter: *${p}%* 💕${p > 75 ? ' — down bad' : ''}`,
+      `${t} is ${p}% simp energy`,
+    ],
+  }),
+  createRateCommand('toxicrate', ['toxic'], {
+    description: 'Rate someone\'s toxicity',
+    usage: '.toxicrate @user',
+    salt: 4,
+    lines: (p, t) => [
+      `${t} Toxicity: *${p}%* ☢️${p > 80 ? ' — human hazard' : ''}`,
+      `${t} chaos level: *${p}/100*`,
+    ],
+  }),
+  createRateCommand('howgay', ['howgay'], {
+    description: 'How gay percentage',
+    usage: '.howgay @user',
+    salt: 5,
+    lines: (p, t) => [`${t} is *${p}%* fabulous 🌈`],
+  }),
+  createRateCommand('howdumb', ['dumbrate'], {
+    description: 'How dumb percentage',
+    usage: '.howdumb @user',
+    salt: 6,
+    lines: (p, t) => [`${t} dumb level: *${p}%* 🤡${p > 85 ? ' — legendary' : ''}`],
+  }),
+];
+
+const pairRateCommands = [
+  createPairRateCommand('bestie', ['bestfriend', 'bff'], {
+    description: 'Bestie compatibility',
+    usage: '.bestie @user1 @user2',
+    salt: 7,
+    lines: (p, a, b) => [
+      `${a} + ${b} = *${p}%* bestie energy 🤝`,
+      `Friendship score ${a} & ${b}: *${p}%*${p > 80 ? ' — inseparable' : ''}`,
+    ],
+  }),
+  createPairRateCommand('soulmate', ['soul'], {
+    description: 'Soulmate compatibility',
+    usage: '.soulmate @user1 @user2',
+    salt: 8,
+    lines: (p, a, b) => [
+      `${a} 💫 ${b} = *${p}%* soulmate bond${p > 90 ? ' — written in stars' : ''}`,
+      `Cosmic match ${a} x ${b}: *${p}%*`,
+    ],
+  }),
+];
+
+const pairCommands = [
+  createPairCommand('enemy', ['rival'], {
+    description: 'Why two users would fight',
+    usage: '.enemy @user1 @user2',
+    text: (a, b) => [
+      `⚔️ ${a} vs ${b}\nReason: both think they're the main character.`,
+      `💢 ${a} & ${b} would argue about who started it. Spoiler: both.`,
+      `🔥 ${a} + ${b} = enemies because one replies all and one leaves on read.`,
+    ],
+  }),
+  createPairCommand('marry', ['marriage', 'wed'], {
+    description: 'Fake marry two users',
+    usage: '.marry @user1 @user2',
+    text: (a, b) => `💒 *MARRIAGE CERTIFICATE*\n\n${a} 💍 ${b}\n\nMay your drama be forever shared.`,
+  }),
+  createPairCommand('divorce', ['breakup'], {
+    description: 'Dramatic divorce',
+    usage: '.divorce @user1 @user2',
+    text: (a, b) => `💔 *DIVORCE PAPERS*\n\n${a} ❌ ${b}\n\nReason: irreconcilable memes.`,
+  }),
+  {
+    name: 'vs',
+    aliases: ['compare', 'battle'],
+    category: 'fun',
+    description: 'Compare two users',
+    usage: '.vs @user1 @user2',
+    groupOnly: true,
+    async execute(sock, msg, args, extra) {
+      try {
+        const pair = getTwoUsers(msg, extra, sock);
+        if (pair.error) return extra.reply(pair.error);
+        const { a, b } = pair;
+        const stats = ['IQ', 'Rizz', 'Chaos', 'Luck'];
+        const lines = stats.map((s) => {
+          const pa = percentFromId(a, s.length);
+          const pb = percentFromId(b, s.length + 3);
+          const win = pa === pb ? 'Tie' : pa > pb ? tag(a) : tag(b);
+          return `*${s}:* ${tag(a)} ${pa} — ${pb} ${tag(b)} → ${win}`;
+        });
+        await sendMention(sock, extra.from, msg, `⚔️ *VS BATTLE*\n\n${lines.join('\n')}`, [a, b]);
+      } catch (e) {
+        console.error('[vs]', e.message);
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'babyname',
+    aliases: ['childname'],
+    category: 'fun',
+    description: 'Combine two names into a baby name',
+    usage: '.babyname @user1 @user2',
+    groupOnly: true,
+    async execute(sock, msg, args, extra) {
+      try {
+        const pair = getTwoUsers(msg, extra, sock);
+        if (pair.error) return extra.reply(pair.error);
+        const n1 = tag(pair.a).slice(1, 4);
+        const n2 = tag(pair.b).slice(1, 4);
+        const names = [`${n1}${n2}`, `${n2}${n1}`, `${n1}Jr`, `Little${n2}`];
+        await sendMention(
+          sock,
+          extra.from,
+          msg,
+          `👶 If ${tag(pair.a)} & ${tag(pair.b)} had a kid:\n\n*${pick(names)}*`,
+          [pair.a, pair.b]
+        );
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+];
+
+const randomCommands = [
+  createRandomCommand('8ball', ['eightball', 'ball'], {
+    description: 'Magic 8ball',
+    usage: '.8ball <question>',
+    build: (args) => {
+      if (!args.length) return null;
+      const answers = ['Yes ✅', 'No ❌', 'Maybe 🤔', 'Ask again later', 'Definitely 😎', 'Absolutely not 💀', 'Signs point to yes'];
+      return `🎱 *${args.join(' ')}*\n\n→ ${pick(answers)}`;
+    },
+    empty: '❌ Ask a question! `.8ball will it rain?`',
+  }),
+  createRandomCommand('fortune', ['cookie'], {
+    description: 'Fortune cookie',
+    usage: '.fortune',
+    pool: FORTUNES.map((f) => `🥠 *Fortune:* ${f}`),
+  }),
+  createRandomCommand('horoscope', ['horo', 'zodiac'], {
+    description: 'Daily horoscope roast',
+    usage: '.horoscope',
+    mentionTarget: true,
+    build: () => `🔮 *Horoscope for {tag}*\n\n${pick(HOROSCOPES)}`,
+  }),
+  createRandomCommand('mood', ['vibe'], {
+    description: 'Today\'s mood for a user',
+    usage: '.mood @user',
+    mentionTarget: true,
+    build: () => `{tag} is feeling: *${pick(MOODS)}* today`,
+  }),
+  createRandomCommand('profession', ['job'], {
+    description: 'Assign a fake profession',
+    usage: '.profession @user',
+    mentionTarget: true,
+    build: () => `{tag}'s profession: *${pick(PROFESSIONS)}*`,
+  }),
+  createRandomCommand('character', ['anime'], {
+    description: 'Assign an anime character',
+    usage: '.character @user',
+    mentionTarget: true,
+    build: () => `{tag} is: *${pick(CHARACTERS)}*`,
+  }),
+  createRandomCommand('fact', ['uselessfact'], {
+    description: 'Random fact',
+    usage: '.fact',
+    pool: FACTS.map((f) => `📚 *Fact:* ${f}`),
+  }),
+  {
+    name: 'quote',
+    aliases: ['q'],
+    category: 'fun',
+    description: 'Random quote',
+    usage: '.quote',
+    async execute(sock, msg, args, extra) {
+      try {
+        let text;
+        try {
+          const q = await APIs.getQuote();
+          text = `"${q.content}"\n— ${q.author}`;
+        } catch {
+          text = `"${pick(LOCAL_QUOTES)}"`;
+        }
+        await extra.reply(text);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'rate',
+    aliases: ['score'],
+    category: 'fun',
+    description: 'Rate anything out of 10',
+    usage: '.rate pizza',
+    async execute(sock, msg, args, extra) {
+      try {
+        const topic = args.join(' ').trim();
+        if (!topic) return extra.reply('Usage: `.rate pizza`');
+        const score = (percentFromId(topic, 9) / 10).toFixed(1);
+        await extra.reply(`⭐ *${topic}* — ${score}/10`);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'choose',
+    aliases: ['decide', 'select'],
+    category: 'fun',
+    description: 'Pick from options',
+    usage: '.choose pizza burger biryani',
+    async execute(sock, msg, args, extra) {
+      try {
+        if (args.length < 2) return extra.reply('Usage: `.choose option1 option2 ...`');
+        await extra.reply(`🎯 I choose: *${pick(args)}*`);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'coinflip',
+    aliases: ['flip', 'coin'],
+    category: 'fun',
+    description: 'Flip a coin',
+    usage: '.coinflip',
+    async execute(sock, msg, args, extra) {
+      try {
+        await extra.reply(pick(['🪙 *Heads!*', '🪙 *Tails!*']));
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'dice',
+    aliases: ['roll'],
+    category: 'fun',
+    description: 'Roll a dice',
+    usage: '.dice',
+    async execute(sock, msg, args, extra) {
+      try {
+        await extra.reply(`🎲 You rolled: *${Math.floor(Math.random() * 6) + 1}*`);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+];
+
+const actionCommands = [
+  createActionCommand('slap', ['hit'], 'slapped', '👋'),
+  createActionCommand('kiss', ['smooch'], 'kissed', '💋'),
+  createActionCommand('hug', ['hugme'], 'hugged', '🤗'),
+  {
+    name: 'poke',
+    aliases: ['prod'],
+    category: 'fun',
+    description: 'Poke a user',
+    usage: '.poke @user',
+    async execute(sock, msg, args, extra) {
+      try {
+        const { jid, tag: t } = getTargetUser(msg, extra);
+        const n = Math.floor(Math.random() * 900) + 100;
+        await sendMention(sock, extra.from, msg, `👉 ${tag(extra.sender)} poked ${t} *${n}* times!`, [extra.sender, jid]);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+];
+
+function makeStatsCmd(name, aliases, desc, builder) {
+  return {
+    name,
+    aliases,
+    category: 'fun',
+    description: desc,
+    usage: `.${name}`,
+    groupOnly: true,
+    async execute(sock, msg, args, extra) {
+      try {
+        const text = await builder(extra);
+        if (!text) return extra.reply('📊 No data yet. Chat more!');
+        const mentions = text.mentions || [];
+        await sock.sendMessage(extra.from, { text: text.body, mentions }, { quoted: msg });
+      } catch (e) {
+        console.error(`[${name}]`, e.message);
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  };
+}
+
+const statsCommands = [
+  makeStatsCmd('mostactive', ['topactive'], 'Most active members today', async (extra) => {
+    const stats = getStats(extra.from);
+    if (!stats) return null;
+    const top = rankUsers(stats.users, 5);
+    return {
+      body: `🏆 *Most Active Today*\n\n${top.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} msgs`).join('\n')}`,
+      mentions: top.map(([id]) => id),
+    };
+  }),
+  makeStatsCmd('mostquiet', ['silent', 'lurker'], 'Quietest members today', async (extra) => {
+    const stats = getStats(extra.from);
+    if (!stats?.users) return null;
+    const sorted = Object.entries(stats.users).sort((a, b) => a[1] - b[1]).slice(0, 5);
+    if (!sorted.length) return null;
+    return {
+      body: `🤫 *Most Quiet (but still alive)*\n\n${sorted.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} msgs`).join('\n')}`,
+      mentions: sorted.map(([id]) => id),
+    };
+  }),
+  makeStatsCmd('nightowl', ['night'], 'Who texts late at night', async (extra) => {
+    const stats = getStats(extra.from);
+    if (!stats?.night) return null;
+    const top = rankUsers(stats.night, 5);
+    if (!top.length) return null;
+    return {
+      body: `🦉 *Night Owls*\n\n${top.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} late msgs`).join('\n')}`,
+      mentions: top.map(([id]) => id),
+    };
+  }),
+  makeStatsCmd('mentionking', ['mostmentioned'], 'Most mentioned member', async (extra) => {
+    const stats = getStats(extra.from);
+    if (!stats?.mentioned) return null;
+    const top = rankUsers(stats.mentioned, 5);
+    if (!top.length) return null;
+    return {
+      body: `👑 *Mention Kings/Queens*\n\n${top.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} mentions`).join('\n')}`,
+      mentions: top.map(([id]) => id),
+    };
+  }),
+  makeStatsCmd('stickerking', ['stickers'], 'Top sticker senders', async (extra) => {
+    const stats = getStats(extra.from);
+    if (!stats?.stickers) return null;
+    const top = rankUsers(stats.stickers, 5);
+    if (!top.length) return null;
+    return {
+      body: `🎭 *Sticker Kings*\n\n${top.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} stickers`).join('\n')}`,
+      mentions: top.map(([id]) => id),
+    };
+  }),
+  makeStatsCmd('weeklymvp', ['mvp', 'weekmvp'], 'Weekly MVP by messages', async (extra) => {
+    const stats = getWeeklyStats(extra.from);
+    if (!stats) return null;
+    const top = rankUsers(stats.users, 3);
+    return {
+      body: `🏅 *Weekly MVP*\n\n${top.map(([id, c], i) => `${i + 1}. @${id.split('@')[0]} — ${c} msgs (7 days)`).join('\n')}`,
+      mentions: top.map(([id]) => id),
+    };
+  }),
+  {
+    name: 'roastoftheday',
+    aliases: ['rotd', 'dailyroast'],
+    category: 'fun',
+    description: 'Roast a random member',
+    usage: '.roastoftheday',
+    groupOnly: true,
+    async execute(sock, msg, args, extra) {
+      try {
+        const parts = extra.groupMetadata?.participants?.map((p) => p.id).filter((id) => id !== sock.user?.id) || [];
+        if (!parts.length) return extra.reply('❌ No members.');
+        const victim = pick(parts);
+        const roasts = [
+          'main character energy but in a background role',
+          'the group\'s unofficial meme supplier (quality: questionable)',
+          'would start a group call and not talk',
+          'replies "lol" to everything including tragedies',
+        ];
+        await sendMention(sock, extra.from, msg, `☀️ *Roast of the Day*\n\n${tag(victim)} is ${pick(roasts)}.`, [victim]);
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+];
+
+function makeAiCmd(name, aliases, usage, promptFn) {
+  return {
+    name,
+    aliases,
+    category: 'fun',
+    description: usage,
+    usage: `.${name}`,
+    async execute(sock, msg, args, extra) {
+      try {
+        const prompt = promptFn(args, extra, msg);
+        if (!prompt) return extra.reply(`❌ Usage: \`.${name} ${usage}\``);
+        const text = await askFunAi(prompt);
+        await extra.reply(text);
+      } catch (e) {
+        console.error(`[${name}]`, e.message);
+        await extra.reply('❌ AI failed. Try again later.');
+      }
+    },
+  };
+}
+
+const aiCommands = [
+  {
+    name: 'roastai',
+    aliases: ['airoast'],
+    category: 'fun',
+    description: 'AI roast a user',
+    usage: '.roastai @user [topic]',
+    async execute(sock, msg, args, extra) {
+      try {
+        const ctx = msg.message?.extendedTextMessage?.contextInfo || {};
+        const mentioned = ctx.mentionedJid || [];
+        let targetId = null;
+        if (mentioned.length) targetId = mentioned[0];
+        else if (ctx.participant) targetId = ctx.participant;
+        else targetId = extra.sender;
+
+        const targetTag = `@${targetId.split('@')[0]}`;
+        const name = getUserName(targetId, extra, msg);
+        const topic = args.join(' ').trim();
+        const prompt = topic
+          ? `Roast ${name} about "${topic}" in 2-3 funny savage lines. Use their name naturally. Keep it playful. Max 200 words.`
+          : `Roast ${name} in 2-3 funny savage lines. Use their name naturally. Keep it playful. Max 200 words.`;
+        const roast = await askFunAi(prompt);
+        await sock.sendMessage(extra.from, {
+          text: `${targetTag}\n\n${roast}`,
+          mentions: [targetId],
+        }, { quoted: msg });
+      } catch (e) {
+        console.error('[roastai]', e.message);
+        await extra.reply('❌ AI failed. Try again later.');
+      }
+    },
+  },
+  makeAiCmd('story', ['aistory'], '<theme>', (args) => {
+    if (!args.length) return null;
+    return `Write a funny 3-line story about: ${args.join(' ')}`;
+  }),
+  makeAiCmd('debate', ['hotake'], '<topic>', (args) => {
+    if (!args.length) return null;
+    return `Give a chaotic hot take about "${args.join(' ')}" in 2 sentences. Be funny.`;
+  }),
+  makeAiCmd('pick', ['advice'], '<question>', (args) => {
+    if (!args.length) return null;
+    return `Give chaotic but funny advice for: "${args.join(' ')}". 2-3 sentences max.`;
+  }),
+  {
+    name: 'wanted',
+    aliases: ['poster'],
+    category: 'fun',
+    description: 'Wanted poster for a user',
+    usage: '.wanted @user',
+    async execute(sock, msg, args, extra) {
+      try {
+        const { jid, tag: t } = getTargetUser(msg, extra);
+        const crimes = ['excessive memes', 'leaving on read', 'starting drama', 'being too funny', 'spamming stickers'];
+        await sendMention(
+          sock,
+          extra.from,
+          msg,
+          `☠️ *WANTED* ☠️\n\n${t}\n\nCrime: ${pick(crimes)}\nReward: ${percentFromId(jid, 11)} coins\n\nDead or alive (preferably alive).`,
+          [jid]
+        );
+      } catch (e) {
+        await extra.reply('❌ Something went wrong.');
+      }
+    },
+  },
+  {
+    name: 'caption',
+    aliases: ['funnycaption'],
+    category: 'fun',
+    description: 'Funny caption for replied image',
+    usage: '.caption (reply to image)',
+    async execute(sock, msg, args, extra) {
+      try {
+        const ctx = msg.message?.extendedTextMessage?.contextInfo;
+        const quoted = ctx?.quotedMessage;
+        const hasImage = quoted && (quoted.imageMessage || quoted.stickerMessage || quoted.videoMessage);
+        if (!hasImage) return extra.reply('❌ Reply to an image or video.');
+        const hint = args.join(' ') || 'something funny and savage';
+        const text = await askFunAi(`Write one funny WhatsApp caption for a photo about: ${hint}. Max 2 lines. Plain text only.`);
+        await extra.reply(text.slice(0, 500));
+      } catch (e) {
+        console.error('[caption]', e.message);
+        await extra.reply('❌ AI failed. Try again later.');
+      }
+    },
+  },
+];
+
+const allCommands = [
+  ...rateCommands,
+  ...pairRateCommands,
+  ...pairCommands,
+  ...randomCommands,
+  ...actionCommands,
+  ...statsCommands,
+  ...gameCommands,
+  ...aiCommands,
+];
+
+module.exports = allCommands;