diff --git a/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp b/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp
index 1feac1b3..56eb50fd 100644
--- a/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp
+++ b/Controllers/GalaxGPUController/GalaxGPUControllerDetect.cpp
@@ -17,25 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-using namespace std::chrono_literals;
-
-typedef struct
-{
-    int             pci_vendor;
-    int             pci_device;
-    int             pci_subsystem_vendor;
-    int             pci_subsystem_device;
-    const char *    name;
-} gpu_pci_device;
-
-#define GPU_NUM_DEVICES (sizeof(device_list) / sizeof(device_list[ 0 ]))
-
-static const gpu_pci_device device_list[] =
-{
-    { NVIDIA_VEN,   NVIDIA_RTX2070_DEV,     NVIDIA_SUB_VEN,     KFA2_RTX_2070_EX_SUB_DEV,               "KFA2 RTX 2070 EX"                      },
-    { NVIDIA_VEN,   NVIDIA_RTX2070S_OC_DEV, NVIDIA_SUB_VEN,     GALAX_RTX_2070S_EX_GAMER_BLACK_SUB_DEV, "GALAX RTX 2070 Super EX Gamer Black"   },
-    { NVIDIA_VEN,   NVIDIA_RTX2080_DEV,     NVIDIA_SUB_VEN,     KFA2_RTX_2080_EX_OC_SUB_DEV,            "KFA2 RTX 2080 EX OC"                   },
-};
 /******************************************************************************************\
 *                                                                                          *
 *   TestForGalaxGPUController                                                              *
@@ -50,6 +31,7 @@ bool TestForGalaxGPUController(i2c_smbus_interface* bus, unsigned char address)
 
     unsigned char res  = bus->i2c_smbus_read_byte_data(address, 0x00);
     unsigned char res2 = bus->i2c_smbus_read_byte_data(address, 0x01);
+    
     if(res == 0x27 && res2 == 0x10)
     {
         pass = true;
@@ -68,32 +50,18 @@ bool TestForGalaxGPUController(i2c_smbus_interface* bus, unsigned char address)
 *                                                                                          *
 \******************************************************************************************/
 
-void DetectGalaxGPUControllers(std::vector<i2c_smbus_interface*> &busses)
+void DetectGalaxGPUControllers(i2c_smbus_interface* bus, uint8_t i2c_addr, const std::string& name)
 {
-    for(unsigned int bus = 0; bus < busses.size(); bus++)
+    if(TestForGalaxGPUController(bus, i2c_addr))
     {
-        // Check for GALAX controller at 0x23
-        for(unsigned int dev_idx = 0; dev_idx < GPU_NUM_DEVICES; dev_idx++)
-        {
-            if(busses[bus]->pci_vendor           == device_list[dev_idx].pci_vendor           &&
-               busses[bus]->pci_device           == device_list[dev_idx].pci_device           &&
-               busses[bus]->pci_subsystem_vendor == device_list[dev_idx].pci_subsystem_vendor &&
-               busses[bus]->pci_subsystem_device == device_list[dev_idx].pci_subsystem_device)
-            {
-                LOG_DEBUG(GPU_DETECT_MESSAGE, "Galax GPU", bus, device_list[dev_idx].pci_device, device_list[dev_idx].pci_subsystem_device, device_list[dev_idx].name );
+        GalaxGPUController*     controller     = new GalaxGPUController(bus, i2c_addr);
+        RGBController_GalaxGPU* rgb_controller = new RGBController_GalaxGPU(controller);
+        rgb_controller->name                   = name;
 
-                if(TestForGalaxGPUController(busses[bus], 0x23))
-                {
-                    GalaxGPUController*     controller     = new GalaxGPUController(busses[bus], 0x23);
-                    RGBController_GalaxGPU* rgb_controller = new RGBController_GalaxGPU(controller);
-                    rgb_controller->name                   = device_list[dev_idx].name;
-
-                    ResourceManager::get()->RegisterRGBController(rgb_controller);
-                }
-            }
-        }
+        ResourceManager::get()->RegisterRGBController(rgb_controller);
     }
-
 } /* DetectGalaxGPUControllers() */
 
-REGISTER_I2C_DETECTOR("Galax GPU", DetectGalaxGPUControllers);
+REGISTER_I2C_PCI_DETECTOR("KFA2 RTX 2070 EX",                       DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070_DEV,     NVIDIA_SUB_VEN, KFA2_RTX_2070_EX_SUB_DEV,               0x23);
+REGISTER_I2C_PCI_DETECTOR("GALAX RTX 2070 Super EX Gamer Black",    DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2070S_OC_DEV, NVIDIA_SUB_VEN, GALAX_RTX_2070S_EX_GAMER_BLACK_SUB_DEV, 0x23);
+REGISTER_I2C_PCI_DETECTOR("KFA2 RTX 2080 EX OC",                    DetectGalaxGPUControllers,  NVIDIA_VEN, NVIDIA_RTX2080_DEV,     NVIDIA_SUB_VEN, KFA2_RTX_2080_EX_OC_SUB_DEV,            0x23);
\ No newline at end of file