diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
index 86a979a..1062023 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
@@ -368,42 +368,6 @@
             property:
                 name: Functional
                 type: bool
-          - name: zone0_cores
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-          - name: zone0_dimms
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-          - name: zone0_gpu_cores
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
-          - name: zone0_gpu_memory
-            zone_conditions:
-                - name: air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
       matches:
           - name: interfacesAdded
           - name: propertiesChanged
@@ -449,15 +413,6 @@
             property:
                 name: Functional
                 type: bool
-          - name: zone0_dimms
-            zone_conditions:
-                - name: water_and_air_cooled_chassis
-                  zones:
-                      - 0
-            interface: xyz.openbmc_project.State.Decorator.OperationalStatus
-            property:
-                name: Functional
-                type: bool
       matches:
           - name: interfacesAdded
           - name: propertiesChanged
@@ -614,6 +569,52 @@
               - name: interfacesAdded
               - name: propertiesChanged
           events:
+              - name: fails_before_high_speed_air
+                groups:
+                    - name: zone0_cores
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 0
+                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+                      property:
+                          name: Functional
+                          type: bool
+                    - name: zone0_dimms
+                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+                      property:
+                          name: Functional
+                          type: bool
+                    - name: zone0_gpu_cores
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 0
+                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+                      property:
+                          name: Functional
+                          type: bool
+                    - name: zone0_gpu_memory
+                      zone_conditions:
+                          - name: air_cooled_chassis
+                            zones:
+                                - 0
+                      interface: xyz.openbmc_project.State.Decorator.OperationalStatus
+                      property:
+                          name: Functional
+                          type: bool
+                matches:
+                    - name: interfacesAdded
+                    - name: propertiesChanged
+                actions:
+                    - name: count_state_before_speed
+                      count: 1
+                      property:
+                          value: false
+                          type: bool
+                      speed:
+                          value: 10500
+                          type: uint64_t
               - name: speed_changes_based_on_core_temps
                 groups:
                     - name: zone0_cores