diff --git a/src/commands/verify.ts b/src/commands/verify.ts
index 9ce6d1d..a2626c3 100644
--- a/src/commands/verify.ts
+++ b/src/commands/verify.ts
@@ -99,7 +99,7 @@ export default {
             }]
         })
 
-        const linkedDiscord = player?.socialMedia?.links?.DISCORD || null
+        const linkedDiscord = player?.socialMedia?.links?.DISCORD
         if (!linkedDiscord) {
             interaction.editReply({
                 embeds: [{
diff --git a/src/components/modals/verifyModal.ts b/src/components/modals/verifyModal.ts
index 51f9097..d4f7633 100644
--- a/src/components/modals/verifyModal.ts
+++ b/src/components/modals/verifyModal.ts
@@ -1,9 +1,9 @@
 import { getUUID, getPlayer, getGuild, getHeadURL } from "utils/Hypixel.js"
 import { embedColor, hypixelGuildID, devMessage } from "config/options.js"
 import verify from "schemas/verifyTag.js"
-import { gm, manager, moderator, beast, elite, member, guildRole, guildStaff, defaultMember } from "config/roles.js"
 import { IModal } from "interfaces"
 import { GuildMember } from "discord.js"
+import roleManage from "utils/functions/rolesmanage.js"
 
 export default {
     name: "verifybox",
@@ -20,6 +20,13 @@ export default {
             return
         }
 
+        await interaction.editReply({
+            embeds: [{
+                description: "Fetching your uuid...",
+                color: embedColor
+            }]
+        })
+
         const uuid = await getUUID(ign)
         if (!uuid) {
             interaction.editReply({
@@ -31,6 +38,13 @@ export default {
             return
         }
 
+        await interaction.editReply({
+            embeds: [{
+                description: "Fetching your player data...",
+                color: embedColor
+            }]
+        })
+
         const head = await getHeadURL(ign)
         const player = await getPlayer(uuid)
         if (!player) {
@@ -50,6 +64,14 @@ export default {
             username = user.user.username + "#" + user.user.discriminator
         }
 
+        await interaction.editReply({
+            embeds: [{
+                description: "Checking your Discord tag...",
+                color: embedColor
+            }]
+        })
+
+
         const linkedDiscord = player?.socialMedia?.links?.DISCORD
         if (!linkedDiscord) {
             interaction.editReply({
@@ -73,6 +95,13 @@ export default {
             return
         }
 
+        await interaction.editReply({
+            embeds: [{
+                description: "Fetching your guild data...",
+                color: embedColor
+            }]
+        })
+
         const guild = await getGuild(uuid)
         let guildID: string | null
         if (!guild) {
@@ -85,40 +114,37 @@ export default {
             const GuildMembers = guild!.members
             const guildRank = GuildMembers.find(member => member.uuid === player.uuid)!.rank
 
-            if (guildRank === "Guild Master" && guildID === hypixelGuildID) {
-                await user.roles.add(gm, "Verification")
-                await user.roles.add(guildRole, "Verification")
-                await user.roles.add(guildStaff, "Verification")
+            if (guildRank === "Guild Master") {
+                const roles = roleManage("gm")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            if (guildRank === "Manager" && guildID === hypixelGuildID) {
-                await user.roles.add(manager, "Verification")
-                await user.roles.add(guildRole, "Verification")
-                await user.roles.add(guildStaff, "Verification")
+            if (guildRank === "Manager") {
+                const roles = roleManage("manager")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            if (guildRank === "Moderator" && guildID === hypixelGuildID) {
-                await user.roles.add(moderator, "Verification")
-                await user.roles.add(guildRole, "Verification")
-                await user.roles.add(guildStaff, "Verification")
+            if (guildRank === "Moderator") {
+                const roles = roleManage("moderator")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            if (guildRank === "Beast" && guildID === hypixelGuildID) {
-                await user.roles.add(beast, "Verification")
-                await user.roles.add(guildRole, "Verification")
+            if (guildRank === "Beast") {
+                const roles = roleManage("beast")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            if (guildRank === "Elite" && guildID === hypixelGuildID) {
-                await user.roles.add(elite, "Verification")
-                await user.roles.add(guildRole, "Verification")
+            if (guildRank === "Elite") {
+                const roles = roleManage("elite")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            if (guildRank === "Member" && guildID === hypixelGuildID) {
-                await user.roles.add(member, "Verification")
-                await user.roles.add(guildRole, "Verification")
+            if (guildRank === "Member") {
+                const roles = roleManage("member")
+                await user.roles.add(roles.rolesToAdd, "Verification")
             }
 
-            await user.roles.add(defaultMember, "Verification")
+            await user.roles.add(roleManage("default").rolesToAdd, "Verification")
             await user.setNickname(player.displayname!, "Verification").catch(() => {
                 // Do nothing
             })