diff --git a/Laptops/backlight.md b/Laptops/backlight.md
index 00fbfc3..56b4765 100644
--- a/Laptops/backlight.md
+++ b/Laptops/backlight.md
@@ -6,7 +6,7 @@ No configuration required for most, just drop the pre-built file into your EFI:
 
 * [SSDT-PNLF](https://github.com/dortania/Getting-Started-With-ACPI/blob/master/extra-files/SSDT-PNLF.aml)
   * For most users
-* [SSDT-PNLFCFL](https://i.applelife.ru/2019/12/463488_SSDT-PNLFCFL.aml.zip)
+* [SSDT-PNLF-CFL](https://github.com/dortania/Getting-Started-With-ACPI/blob/master/extra-files/SSDT-PNLF-CFL.aml)
   * For Coffee Lake and newer
 
 Note: there are some rare cases where the iGPU is called `GPU0` or `VID`in the DSDT, you can double check by searching for `PCI0.GFX0`, `PCI0.VID` and `PCI0.GPU0`. Whichever shows up is your device
diff --git a/Universal/awac.md b/Universal/awac.md
index 79c0107..2241902 100644
--- a/Universal/awac.md
+++ b/Universal/awac.md
@@ -2,13 +2,15 @@
 
 **For Intel 300 series chipsets and newer**, this also includes X299 refreshes and Icelake laptops. Common machines:
 
-* X299X (10th Gen refresh)
+* X299X (10th Gen refresh, AsRock and Asus don't use the -x naming so you'll need to double check)
 * B360
 * B365
 * H310
 * H370
 * Z370 (Gigabyte and AsRock boards with newer BIOS versions)
 * Z390
+* B460
+* Z490
 * 400 series (Cometlake)
 * 495 series (Icelake)
 
diff --git a/Universal/smbus.md b/Universal/smbus.md
index 4178ae2..6ba71a7 100644
--- a/Universal/smbus.md
+++ b/Universal/smbus.md
@@ -64,3 +64,13 @@ For those having issues, you can also check Device Manager -> CPU -> BIOS device
 **Note**: The MCHC is actually the DRAM controller, similar idea to SMBus for fixing memory reporting
 
 ## [Now you're ready to compile the SSDT!](/Manual/compile.md)
+
+## Verify it's working
+
+To check if the SSDT is working correctly, run the following in terminal:
+
+```
+kextstat | grep -E "AppleSMBusController|AppleSMBusPCI"
+```
+
+![](/images/Universal/smbus-md/verify.png)
diff --git a/extra-files/SSDT-EC-DESKTOP.aml b/extra-files/SSDT-EC-DESKTOP.aml
index e8b863b..f547c92 100644
Binary files a/extra-files/SSDT-EC-DESKTOP.aml and b/extra-files/SSDT-EC-DESKTOP.aml differ
diff --git a/extra-files/SSDT-EC-DESKTOP.dsl b/extra-files/SSDT-EC-DESKTOP.dsl
index ddab2fa..32d080c 100644
--- a/extra-files/SSDT-EC-DESKTOP.dsl
+++ b/extra-files/SSDT-EC-DESKTOP.dsl
@@ -1,6 +1,5 @@
 /*
  * What this mess of an SSDT tries to accomplish is this:
- *  - Find ECs(Device = 0x06) 
  *  - Disable valid ECs, they will have the following properties:
  *      - _HID
  *      - _CRS
@@ -59,8 +58,8 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     
     
     
-    // Let the AMD Trash being(and glorious Core2)
-    If ((ObjectType (\_SB.PCI0.SBRG.EC) == 0x06))
+// Let the AMD Trash being(and glorious Core2)
+    If ((CondRefOf (\_SB.PCI0.SBRG.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.EC._HID) && CondRefOf (\_SB.PCI0.SBRG.EC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.EC._STA)))
@@ -82,7 +81,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.EC0._HID) && CondRefOf (\_SB.PCI0.SBRG.EC0._CRS)) && CondRefOf (\_SB.PCI0.SBRG.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.EC0._STA)))
@@ -104,7 +103,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.H_EC._HID) && CondRefOf (\_SB.PCI0.SBRG.H_EC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.H_EC._STA)))
@@ -126,7 +125,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.ECDV._HID) && CondRefOf (\_SB.PCI0.SBRG.ECDV._CRS)) && CondRefOf (\_SB.PCI0.SBRG.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.ECDV._STA)))
@@ -148,7 +147,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.SBRG.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.SBRG.PGEC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.SBRG.PGEC._STA)))
@@ -172,7 +171,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
 
     // Now we go to consumer
     
-    If ((ObjectType (\_SB.PCI0.LPCB.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.EC._HID) && CondRefOf (\_SB.PCI0.LPCB.EC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.EC._STA)))
@@ -194,7 +193,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.EC0._HID) && CondRefOf (\_SB.PCI0.LPCB.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPCB.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.EC0._STA)))
@@ -216,7 +215,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.H_EC._HID) && CondRefOf (\_SB.PCI0.LPCB.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.H_EC._STA)))
@@ -238,7 +237,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.ECDV._HID) && CondRefOf (\_SB.PCI0.LPCB.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPCB.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.ECDV._STA)))
@@ -260,7 +259,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPCB.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPCB.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPCB.PGEC._STA)))
@@ -283,7 +282,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     }    
     // Laptop trash
     
-    If ((ObjectType (\_SB.PCI0.LPC.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.EC._HID) && CondRefOf (\_SB.PCI0.LPC.EC._CRS)) && CondRefOf (\_SB.PCI0.LPC.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.EC._STA)))
@@ -305,7 +304,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.EC0._HID) && CondRefOf (\_SB.PCI0.LPC.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPC.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.EC0._STA)))
@@ -327,7 +326,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.H_EC._HID) && CondRefOf (\_SB.PCI0.LPC.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPC.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.H_EC._STA)))
@@ -349,7 +348,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.ECDV._HID) && CondRefOf (\_SB.PCI0.LPC.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPC.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.ECDV._STA)))
@@ -371,7 +370,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPC.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPC.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPC.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPC.PGEC._STA)))
@@ -395,7 +394,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     
     // X79 and X99 trash
     
-    If ((ObjectType (\_SB.PCI0.LPC0.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.EC._HID) && CondRefOf (\_SB.PCI0.LPC0.EC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.EC._STA)))
@@ -417,7 +416,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.EC0._HID) && CondRefOf (\_SB.PCI0.LPC0.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPC0.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.EC0._STA)))
@@ -439,7 +438,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.H_EC._HID) && CondRefOf (\_SB.PCI0.LPC0.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.H_EC._STA)))
@@ -461,7 +460,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.ECDV._HID) && CondRefOf (\_SB.PCI0.LPC0.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPC0.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.ECDV._STA)))
@@ -483,7 +482,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPC0.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPC0.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPC0.PGEC._STA)))
@@ -507,7 +506,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         
     // Cursed X299
     
-    If ((ObjectType (\_SB.PC00.LPC0.EC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.EC)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.EC._HID) && CondRefOf (\_SB.PC00.LPC0.EC._CRS)) && CondRefOf (\_SB.PC00.LPC0.EC._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.EC._STA)))
@@ -529,7 +528,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.EC0)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.EC0._HID) && CondRefOf (\_SB.PC00.LPC0.EC0._CRS)) && CondRefOf (\_SB.PC00.LPC0.EC0._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.EC0._STA)))
@@ -551,7 +550,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.H_EC)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.H_EC._HID) && CondRefOf (\_SB.PC00.LPC0.H_EC._CRS)) && CondRefOf (\_SB.PC00.LPC0.H_EC._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.H_EC._STA)))
@@ -573,7 +572,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.ECDV)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.ECDV._HID) && CondRefOf (\_SB.PC00.LPC0.ECDV._CRS)) && CondRefOf (\_SB.PC00.LPC0.ECDV._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.ECDV._STA)))
@@ -595,7 +594,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.PGEC)))
     {
         If (((((CondRefOf (\_SB.PC00.LPC0.PGEC._HID)) && CondRefOf (
             \_SB.PC00.LPC0.PGEC._CRS)) && CondRefOf (\_SB.PC00.LPC0.PGEC._GPE)) && !CondRefOf (\_SB.PC00.LPC0.PGEC._STA)))
diff --git a/extra-files/SSDT-EC-USBX-DESKTOP.aml b/extra-files/SSDT-EC-USBX-DESKTOP.aml
index c458efa..5e60d72 100644
Binary files a/extra-files/SSDT-EC-USBX-DESKTOP.aml and b/extra-files/SSDT-EC-USBX-DESKTOP.aml differ
diff --git a/extra-files/SSDT-EC-USBX-DESKTOP.dsl b/extra-files/SSDT-EC-USBX-DESKTOP.dsl
index 53c55af..69cb439 100644
--- a/extra-files/SSDT-EC-USBX-DESKTOP.dsl
+++ b/extra-files/SSDT-EC-USBX-DESKTOP.dsl
@@ -1,6 +1,5 @@
 /*
  * What this mess of an SSDT tries to accomplish is this:
- *  - Find ECs(Device = 0x06) 
  *  - Disable valid ECs, they will have the following properties:
  *      - _HID
  *      - _CRS
@@ -60,7 +59,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     
     
     // Let the AMD Trash being(and glorious Core2)
-    If ((ObjectType (\_SB.PCI0.SBRG.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.EC._HID) && CondRefOf (\_SB.PCI0.SBRG.EC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.EC._STA)))
@@ -82,7 +81,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.EC0._HID) && CondRefOf (\_SB.PCI0.SBRG.EC0._CRS)) && CondRefOf (\_SB.PCI0.SBRG.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.EC0._STA)))
@@ -104,7 +103,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.H_EC._HID) && CondRefOf (\_SB.PCI0.SBRG.H_EC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.H_EC._STA)))
@@ -126,7 +125,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.SBRG.ECDV._HID) && CondRefOf (\_SB.PCI0.SBRG.ECDV._CRS)) && CondRefOf (\_SB.PCI0.SBRG.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.SBRG.ECDV._STA)))
@@ -148,7 +147,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.SBRG.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.SBRG.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.SBRG.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.SBRG.PGEC._CRS)) && CondRefOf (\_SB.PCI0.SBRG.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.SBRG.PGEC._STA)))
@@ -172,7 +171,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
 
     // Now we go to consumer
     
-    If ((ObjectType (\_SB.PCI0.LPCB.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.EC._HID) && CondRefOf (\_SB.PCI0.LPCB.EC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.EC._STA)))
@@ -194,7 +193,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.EC0._HID) && CondRefOf (\_SB.PCI0.LPCB.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPCB.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.EC0._STA)))
@@ -216,7 +215,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.H_EC._HID) && CondRefOf (\_SB.PCI0.LPCB.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.H_EC._STA)))
@@ -238,7 +237,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPCB.ECDV._HID) && CondRefOf (\_SB.PCI0.LPCB.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPCB.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPCB.ECDV._STA)))
@@ -260,7 +259,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPCB.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPCB.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPCB.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPCB.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPCB.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPCB.PGEC._STA)))
@@ -283,7 +282,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     }    
     // Laptop trash
     
-    If ((ObjectType (\_SB.PCI0.LPC.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.EC._HID) && CondRefOf (\_SB.PCI0.LPC.EC._CRS)) && CondRefOf (\_SB.PCI0.LPC.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.EC._STA)))
@@ -305,7 +304,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.EC0._HID) && CondRefOf (\_SB.PCI0.LPC.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPC.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.EC0._STA)))
@@ -327,7 +326,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.H_EC._HID) && CondRefOf (\_SB.PCI0.LPC.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPC.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.H_EC._STA)))
@@ -349,7 +348,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC.ECDV._HID) && CondRefOf (\_SB.PCI0.LPC.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPC.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC.ECDV._STA)))
@@ -371,7 +370,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPC.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPC.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPC.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPC.PGEC._STA)))
@@ -395,7 +394,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
     
     // X79 and X99 trash
     
-    If ((ObjectType (\_SB.PCI0.LPC0.EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.EC._HID) && CondRefOf (\_SB.PCI0.LPC0.EC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.EC._STA)))
@@ -417,7 +416,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.EC0)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.EC0._HID) && CondRefOf (\_SB.PCI0.LPC0.EC0._CRS)) && CondRefOf (\_SB.PCI0.LPC0.EC0._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.EC0._STA)))
@@ -439,7 +438,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.H_EC)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.H_EC._HID) && CondRefOf (\_SB.PCI0.LPC0.H_EC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.H_EC._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.H_EC._STA)))
@@ -461,7 +460,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.ECDV)))
     {
         If ((((CondRefOf (\_SB.PCI0.LPC0.ECDV._HID) && CondRefOf (\_SB.PCI0.LPC0.ECDV._CRS)) && CondRefOf (\_SB.PCI0.LPC0.ECDV._GPE
             )) && !CondRefOf (\_SB.PCI0.LPC0.ECDV._STA)))
@@ -483,7 +482,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PCI0.LPC0.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PCI0.LPC0.PGEC)))
     {
         If (((((CondRefOf (\_SB.PCI0.LPC0.PGEC._HID)) && CondRefOf (
             \_SB.PCI0.LPC0.PGEC._CRS)) && CondRefOf (\_SB.PCI0.LPC0.PGEC._GPE)) && !CondRefOf (\_SB.PCI0.LPC0.PGEC._STA)))
@@ -507,7 +506,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         
     // Cursed X299
     
-    If ((ObjectType (\_SB.PC00.LPC0.EC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.EC)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.EC._HID) && CondRefOf (\_SB.PC00.LPC0.EC._CRS)) && CondRefOf (\_SB.PC00.LPC0.EC._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.EC._STA)))
@@ -529,7 +528,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.EC0) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.EC0)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.EC0._HID) && CondRefOf (\_SB.PC00.LPC0.EC0._CRS)) && CondRefOf (\_SB.PC00.LPC0.EC0._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.EC0._STA)))
@@ -551,7 +550,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.H_EC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.H_EC)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.H_EC._HID) && CondRefOf (\_SB.PC00.LPC0.H_EC._CRS)) && CondRefOf (\_SB.PC00.LPC0.H_EC._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.H_EC._STA)))
@@ -573,7 +572,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.ECDV) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.ECDV)))
     {
         If ((((CondRefOf (\_SB.PC00.LPC0.ECDV._HID) && CondRefOf (\_SB.PC00.LPC0.ECDV._CRS)) && CondRefOf (\_SB.PC00.LPC0.ECDV._GPE
             )) && !CondRefOf (\_SB.PC00.LPC0.ECDV._STA)))
@@ -595,7 +594,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "SsdtEC", 0x00001000)
         }
     }
 
-    If ((ObjectType (\_SB.PC00.LPC0.PGEC) == 0x06))
+    If ((CondRefOf (\_SB.PC00.LPC0.PGEC)))
     {
         If (((((CondRefOf (\_SB.PC00.LPC0.PGEC._HID)) && CondRefOf (
             \_SB.PC00.LPC0.PGEC._CRS)) && CondRefOf (\_SB.PC00.LPC0.PGEC._GPE)) && !CondRefOf (\_SB.PC00.LPC0.PGEC._STA)))
diff --git a/extra-files/SSDT-PNLF-CFL.aml b/extra-files/SSDT-PNLF-CFL.aml
new file mode 100755
index 0000000..2fee814
Binary files /dev/null and b/extra-files/SSDT-PNLF-CFL.aml differ
diff --git a/images/Universal/smbus-md/verify.png b/images/Universal/smbus-md/verify.png
new file mode 100644
index 0000000..5463f8c
Binary files /dev/null and b/images/Universal/smbus-md/verify.png differ