diff --git a/firmware/components/mainboard/stmf446retx/.vscode/c_cpp_properties.json b/firmware/components/mainboard/stmf446retx/.vscode/c_cpp_properties.json
index 69836baa..b67677ed 100644
--- a/firmware/components/mainboard/stmf446retx/.vscode/c_cpp_properties.json
+++ b/firmware/components/mainboard/stmf446retx/.vscode/c_cpp_properties.json
@@ -36,8 +36,8 @@
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src",
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src",
-                "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
-                "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
+                "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
+                "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include",
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
                 "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc",
@@ -128,8 +128,8 @@
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Class/AUDIO/Src",
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Middlewares/ST/STM32_USB_Device_Library/Core/Src",
-                    "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
-                    "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
+                    "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Src",
+                    "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/Inc",
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Include",
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/CMSIS/Device/ST/STM32F4xx/Include",
                     "/home/kymkim/.platformio/packages/framework-stm32cubef4/Drivers/STM32F4xx_HAL_Driver/Inc",
diff --git a/firmware/components/mainboard/stmf446retx/.vscode/launch.json b/firmware/components/mainboard/stmf446retx/.vscode/launch.json
index 5e2348d7..413ac318 100644
--- a/firmware/components/mainboard/stmf446retx/.vscode/launch.json
+++ b/firmware/components/mainboard/stmf446retx/.vscode/launch.json
@@ -12,7 +12,7 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug",
-            "executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
+            "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
             "projectEnvName": "nucleo_f446re",
             "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
             "internalConsoleOptions": "openOnSessionStart",
@@ -26,7 +26,7 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug (skip Pre-Debug)",
-            "executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
+            "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
             "projectEnvName": "nucleo_f446re",
             "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
             "internalConsoleOptions": "openOnSessionStart",
@@ -36,7 +36,7 @@
             "type": "platformio-debug",
             "request": "launch",
             "name": "PIO Debug (without uploading)",
-            "executable": "/home/kymkim/Projects/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
+            "executable": "/home/kymkim/Projects/module-dev-mskbd/modular-kbd/firmware/components/mainboard/stmf446retx/.pio/build/nucleo_f446re/firmware.elf",
             "projectEnvName": "nucleo_f446re",
             "toolchainBinDir": "/home/kymkim/.platformio/packages/toolchain-gccarmnoneeabi/bin",
             "internalConsoleOptions": "openOnSessionStart",
diff --git a/firmware/components/mainboard/stmf446retx/Src/main.c b/firmware/components/mainboard/stmf446retx/Src/main.c
index 01cb552c..220526d0 100644
--- a/firmware/components/mainboard/stmf446retx/Src/main.c
+++ b/firmware/components/mainboard/stmf446retx/Src/main.c
@@ -30,11 +30,17 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
+typedef struct{
+  uint8_t MODIFIER;
+  uint8_t RESERVED;
+  uint8_t KEYPRESS[13];
+} HIDReportNKRO;
+
 typedef struct{
   uint8_t MODIFIER;
   uint8_t RESERVED;
   uint8_t KEYPRESS[6]; // for 6 Key Rollover, changed index to 6.
-} HIDReport;
+} HIDReport6KRO;
 
 typedef struct{
   GPIO_TypeDef* PORT;
@@ -70,7 +76,7 @@ KbdPins col_pins[COLS] = {
   {GPIOB, GPIO_PIN_14},
   {GPIOB, GPIO_PIN_13}
 };
-HIDReport REPORT = {0,0,0,0,0,0,0,0};
+HIDReportNKRO REPORT = {0,0,0,0,0,0,0,0};
 CAN_RxHeaderTypeDef RxHeader;
 uint8_t RxData[8];
 /* USER CODE END PV */