diff --git a/index.ts b/index.ts
index 36db3a8..1703ae3 100644
--- a/index.ts
+++ b/index.ts
@@ -1,4 +1,3 @@
-import { addPreSendListener, removePreSendListener } from "@api/MessageEvents";
 import { definePluginSettings, Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType, PluginNative } from "@utils/types";
@@ -39,14 +38,9 @@ export default definePlugin({
             type: OptionType.STRING
         }
     }),
-    start() {
-        this.preSend = addPreSendListener(async (c, msg) => {
-            if (Settings.plugins.SentFromMyUname.channelWhitelist && !Settings.plugins.SentFromMyUname.channelWhitelist.includes(c)) return;
-            if (msg.content.startsWith("nouname ")) { msg.content = msg.content.replace("nouname ", ""); return; }
-            msg.content += `\n\nSent from my ${await getWhateverShouldBeSentFromMy()}`;
-        });
-    },
-    stop() {
-        removePreSendListener(this.preSend);
+    onBeforeMessageSend: async (c, msg) => {
+        if (Settings.plugins.SentFromMyUname.channelWhitelist && !Settings.plugins.SentFromMyUname.channelWhitelist.includes(c)) return;
+        if (msg.content.startsWith("nouname ")) { msg.content = msg.content.replace("nouname ", ""); return; }
+        msg.content += `\n\nSent from my ${await getWhateverShouldBeSentFromMy()}`;
     }
 });