diff --git a/randomizer/Lists/CBLocations/DKIslesCBLocations.py b/randomizer/Lists/CBLocations/DKIslesCBLocations.py
index 5610e0cf8..b1033ca36 100644
--- a/randomizer/Lists/CBLocations/DKIslesCBLocations.py
+++ b/randomizer/Lists/CBLocations/DKIslesCBLocations.py
@@ -670,6 +670,20 @@
             [5, 1.0, 2358, 807, 1747],
         ],
     ),
+    ColoredBananaGroup(
+        group=46,
+        map_id=Maps.Isles,
+        name="Tree below caves",
+        konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
+        region=Regions.IslesMain,
+        locations=[
+            [1, 1.0, 2381, 600, 1808],
+            [1, 1.0, 2367, 600, 1764],
+            [1, 1.0, 2319, 600, 1764],
+            [1, 1.0, 2305, 600, 1808],
+            [1, 1.0, 2343, 600, 1836],
+        ],
+    ),  # Linked for logic
     ColoredBananaGroup(
         group=47,
         map_id=Maps.Isles,
@@ -970,17 +984,18 @@
     ColoredBananaGroup(
         group=70,
         map_id=Maps.Isles,
-        name="On the fairy tree",
+        name="Up and around the fairy tree",
         konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
         region=Regions.OuterIsles,
+        logic=lambda l: (l.climbing) or (Events.AirSpaceEntered in l.Events and l.isdiddy),
         locations=[
             [5, 1.0, 1067, 733, 1413],
         ],
     ),
     ColoredBananaGroup(
-        group=71,
+        group=70,
         map_id=Maps.Isles,
-        name="Around the fairy tree",
+        name="Up and around the fairy tree",
         konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
         region=Regions.OuterIsles,
         locations=[
@@ -990,7 +1005,7 @@
             [1, 1.0, 1029, 500, 1425],
             [1, 1.0, 1067, 500, 1453],
         ],
-    ),
+    ),  # Grouped together to make cb trees consistent
     ColoredBananaGroup(
         group=72,
         map_id=Maps.Isles,
@@ -2840,20 +2855,6 @@
         ],
     ),
     # Wave 2 by Snap
-    ColoredBananaGroup(
-        group=219,
-        map_id=Maps.Isles,
-        name="Around the tree below caves",
-        konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
-        region=Regions.IslesMain,
-        locations=[
-            [1, 1.0, 2381, 600, 1808],
-            [1, 1.0, 2367, 600, 1764],
-            [1, 1.0, 2319, 600, 1764],
-            [1, 1.0, 2305, 600, 1808],
-            [1, 1.0, 2343, 600, 1836],
-        ],
-    ),
     ColoredBananaGroup(
         group=220,
         map_id=Maps.Isles,