diff --git a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/enchantment/exploit.json b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/enchantment/exploit.json
index 1afa163..a0bdd8e 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/enchantment/exploit.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/enchantment/exploit.json
@@ -35,31 +35,15 @@
           "factor": 4
         },
         "requirements": {
-          "condition": "minecraft:any_of",
-          "terms": [
-            {
-              "condition": "minecraft:entity_properties",
-              "entity": "this",
-              "predicate": {
-                "equipment": {
-                  "mainhand": {
-                    "items": "#mc_rebalance:exploit_items"
-                  }
-                }
-              }
-            },
-            {
-              "condition": "minecraft:entity_properties",
-              "entity": "this",
-              "predicate": {
-                "equipment": {
-                  "offhand": {
-                    "items": "#mc_rebalance:exploit_items"
-                  }
-                }
+          "condition": "minecraft:entity_properties",
+          "entity": "this",
+          "predicate": {
+            "slots": {
+              "weapon.*": {
+                "items": "#mc_rebalance:exploit_items"
               }
             }
-          ]
+          }
         }
       }
     ]
diff --git a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/enchantment/feather_falling.json b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/enchantment/feather_falling.json
index 9085e56..e5185c7 100644
--- a/overrides/global_packs/mc_rebalance_datapack/data/minecraft/enchantment/feather_falling.json
+++ b/overrides/global_packs/mc_rebalance_datapack/data/minecraft/enchantment/feather_falling.json
@@ -46,8 +46,8 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "equipment": {
-                "legs": {
+              "slots": {
+                "armor.*": {
                   "predicates": {
                     "minecraft:enchantments": [{"enchantments": "minecraft:frost_walker"}]
                   }