diff --git a/Scripts/acpi_guru.py b/Scripts/acpi_guru.py
index a55bd54..b9577e1 100644
--- a/Scripts/acpi_guru.py
+++ b/Scripts/acpi_guru.py
@@ -2412,8 +2412,14 @@ DefinitionBlock("", "SSDT", 2, "ZPSS", "RMNE", 0x00001000)
         }
 
     def is_intel_hedt_cpu(self, processor_name, cpu_codename):
-        return cpu_codename in cpu_data.IntelCPUGenerations[22:] and (cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX")) or not (cpu_codename in ("Arrandale", "Clarksfield", "Lynnfield", "Clarkdale") and "Xeon" not in processor_name))
-     
+        if cpu_codename in cpu_data.IntelCPUGenerations[22:43]:
+            return cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX"))
+        
+        if cpu_codename in cpu_data.IntelCPUGenerations[43:]:
+            return "Xeon" in processor_name
+        
+        return False
+    
     def fix_system_clock_hedt(self):
         awac_device = self.acpi.get_device_paths_with_hid("ACPI000E", self.dsdt)
         try:
diff --git a/Scripts/config_prodigy.py b/Scripts/config_prodigy.py
index 7df547e..d2f3a5d 100644
--- a/Scripts/config_prodigy.py
+++ b/Scripts/config_prodigy.py
@@ -366,8 +366,14 @@ class ConfigProdigy:
         return self.is_low_end_intel_cpu(processor_name) and cpu_codename in cpu_data.IntelCPUGenerations[:39]
 
     def is_intel_hedt_cpu(self, processor_name, cpu_codename):
-        return cpu_codename in cpu_data.IntelCPUGenerations[22:] and (cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX")) or not (cpu_codename in ("Arrandale", "Clarksfield", "Lynnfield", "Clarkdale") and "Xeon" not in processor_name))
-            
+        if cpu_codename in cpu_data.IntelCPUGenerations[22:43]:
+            return cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX"))
+        
+        if cpu_codename in cpu_data.IntelCPUGenerations[43:]:
+            return "Xeon" in processor_name
+        
+        return False
+    
     def spoof_cpuid(self, processor_name, cpu_codename, macos_version):
         if self.is_low_end_haswell_plus(processor_name, cpu_codename):
             return self.cpuids.get("Ivy Bridge")
diff --git a/Scripts/kext_maestro.py b/Scripts/kext_maestro.py
index c82666f..1cb6b0e 100644
--- a/Scripts/kext_maestro.py
+++ b/Scripts/kext_maestro.py
@@ -70,7 +70,13 @@ class KextMaestro:
         return pci_ids
 
     def is_intel_hedt_cpu(self, processor_name, cpu_codename):
-        return cpu_codename in cpu_data.IntelCPUGenerations[22:] and (cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX")) or not (cpu_codename in ("Arrandale", "Clarksfield", "Lynnfield", "Clarkdale") and "Xeon" not in processor_name))
+        if cpu_codename in cpu_data.IntelCPUGenerations[22:43]:
+            return cpu_codename.endswith(("-X", "-P", "-W", "-E", "-EP", "-EX"))
+        
+        if cpu_codename in cpu_data.IntelCPUGenerations[43:]:
+            return "Xeon" in processor_name
+        
+        return False
     
     def get_kext_index(self, name):
         for index, kext in enumerate(self.kexts):