diff --git a/app.js b/app.js
index bf56e61..71982fe 100644
--- a/app.js
+++ b/app.js
@@ -61,28 +61,19 @@ bot.on('message', (msg) => {
 
   for (const x of jointArray) {
     if (msg.text && msg.text.toString() === x.NAME) {
-      common.chat(bot, msg, x.NAME, logger)
+      common.faq(bot, msg, x.NAME, logger)
     }
   }
 
   for (const x of commands) {
     if (msg.text && msg.text.toString().includes(x.NAME)) {
-      common.commands(bot, msg, x.NAME, logger)
+      common.chat(bot, msg, x.NAME, logger)
     }
   }
 
   if (msg.text && msg.text.toString().includes("/chat")) {
-    const chatId = msg.chat.id;
-    match = msg.text.match(/([^\s]+)/g);
-    const resp = match[1]; // the captured "whatever"
-
-    // for (const x of jointArray) {
-    // if (resp === x.NAME) {
-    // common.chat(bot, msg, resp)
-    // }
-    // }
-    console.log('chat')
-    bot.sendMessage(msg.chat.id, resp, logger)
+    match = msg.text.substring(6);
+    common.chat(bot, msg, match, logger)
   }
 
   if (msg.text && msg.text.toString().toLowerCase().includes("set sub")) {
diff --git a/data/bot/functions/requests/updateSubStatus.js b/data/bot/functions/requests/updateSubStatus.js
index 0f52e43..f5764f8 100644
--- a/data/bot/functions/requests/updateSubStatus.js
+++ b/data/bot/functions/requests/updateSubStatus.js
@@ -14,7 +14,7 @@ module.exports = {
                 status = 0
             }
             subs.forEach(function (element, index) {
-                if (element.SUB.toLowerCase() === sub) {
+                if (element.SUB.toLowerCase() === sub.toLowerCase()) {
                     subs[index].STATUS = status;   //set the value  
                 }
             })
diff --git a/data/bot/lib/common.js b/data/bot/lib/common.js
index 514c3ba..995afaf 100644
--- a/data/bot/lib/common.js
+++ b/data/bot/lib/common.js
@@ -1,11 +1,13 @@
 const decache = require('decache');
 
 module.exports = {
-    commands: async (bot, msg, input, logger) => {
+    chat: async (bot, msg, input, logger) => {
         logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " did - " + input);
         const userMention = "<a href=\"tg:\/\/user?id=" + msg.from.id + "\">@" + msg.from.first_name + "<\/a> "
         let commands = require('../../group/commands')
-        for (const x of commands) {
+        let chat = require('../../group/chat')
+        let jointArray = commands.concat(chat)
+        for (const x of jointArray) {
             if (x.NAME === input) {
                 let n = x.NAME
                 let t = x.TEXT
@@ -18,14 +20,12 @@ module.exports = {
             }
         }
     },
-    chat: async (bot, msg, input, logger) => {
+    faq: async (bot, msg, input, logger) => {
         logger.info("ID - " + msg.from.id + " First Name - " + msg.from.first_name + " asked - " + input);
         const userMention = "<a href=\"tg:\/\/user?id=" + msg.from.id + "\">@" + msg.from.first_name + "<\/a> "
         let commands = require('../../group/commands')
         let navigation = require('../../group/FAQ')
-        let chat = require('../../group/chat')
-        let jointArray = commands.concat(navigation, chat)
-
+        let jointArray = commands.concat(navigation)
         for (const x of jointArray) {
             if (x.NAME === input) {
                 let n = x.NAME
diff --git a/data/group/chat.js b/data/group/chat.js
index d61bed4..7925f3f 100644
--- a/data/group/chat.js
+++ b/data/group/chat.js
@@ -2,7 +2,17 @@ const name = process.env.BOT_NAME
 const channel = process.env.CHANNEL
 
 const chat = [
- 
+    {
+        "NAME": "fuck off " + name.toLowerCase(),
+        "TEXT": [
+            "fuck off mate",
+        ]
+    },
+    {
+        "NAME": "i love you " + name.toLowerCase(),
+        "TEXT": [
+            "fuck off mate",
+        ]
+    }
 ]
-
 module.exports = chat;
\ No newline at end of file
diff --git a/data/group/subs.json b/data/group/subs.json
index 0495313..bd6ca8b 100644
--- a/data/group/subs.json
+++ b/data/group/subs.json
@@ -1 +1 @@
-[{"SUB":"Premium Plus","COST":30,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"VIP","COST":25,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Old Premium","COST":17,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Bluemoon","COST":15,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"KDB","COST":14,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"Gold","COST":13,"STATUS":1,"APPS":["XCIPTV Red","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Technoid","COST":13,"STATUS":0,"APPS":["SMARTERS Green"]},{"SUB":"Bronze","COST":10,"STATUS":1,"APPS":["XCIPTV Red","SMARTERS Green"]},{"SUB":"SOL","COST":10,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"New Premium (tvob)","COST":"X","STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"Gambler","COST":"X","STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"All of em","COST":"X","STATUS":"X"}]
\ No newline at end of file
+[{"SUB":"Premium Plus","COST":30,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"VIP","COST":25,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Old Premium","COST":17,"STATUS":1,"APPS":["XCIPTV Blue","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Bluemoon","COST":15,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"KDB","COST":14,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"Gold","COST":13,"STATUS":1,"APPS":["XCIPTV Red","Sky Q Yellow","SMARTERS Green"]},{"SUB":"Technoid","COST":13,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"Bronze","COST":10,"STATUS":1,"APPS":["XCIPTV Red","SMARTERS Green"]},{"SUB":"SOL","COST":10,"STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"New Premium (tvob)","COST":"X","STATUS":0,"APPS":["SMARTERS Green"]},{"SUB":"Gambler","COST":"X","STATUS":1,"APPS":["SMARTERS Green"]},{"SUB":"All of em","COST":"X","STATUS":"X"}]
\ No newline at end of file