diff --git a/XBOXRECV.h b/XBOXRECV.h
index 9dbd98b81..1a0453d82 100644
--- a/XBOXRECV.h
+++ b/XBOXRECV.h
@@ -225,7 +225,8 @@ class XBOXRECV : public USBDeviceConfig {
                 pFuncOnInit = funcOnInit;
         };
 
-        bool getChatpadModifier(ChatpadModiferEnum b, uint8_t controller = 0);
+        bool getChatpadModifierPress(ChatpadModiferEnum b, uint8_t controller = 0);
+        bool getChatpadModifierClick(ChatpadModiferEnum b, uint8_t controller = 0);
         bool getChatpadClick(ChatpadButtonEnum b, uint8_t controller = 0);
         bool chatpadChanged(uint8_t controller = 0);
 
@@ -293,9 +294,8 @@ class XBOXRECV : public USBDeviceConfig {
         /* Chatpad State */        
         bool firstChatpadRun = true;
         bool chatpadInitNeeded[4] = { true };
-        uint8_t chatpadModRaw[4] = {0};
         uint8_t chatpadModState[4] = {0};
-        uint8_t chatpadModRawOld[4] = {0};
+        uint8_t chatpadModStateOld[4] = {0};
         uint8_t chatpadModClickState[4] = {0};
         uint8_t chatpadDataPacketLast[4][3];
         bool flagUpperCase = false;
@@ -306,4 +306,3 @@ class XBOXRECV : public USBDeviceConfig {
         bool chatpadStateChanged[4]; // True if a button has changed
 };
 #endif
-