diff --git a/Hints.py b/Hints.py
index 4029b4968..e9ea73ed8 100644
--- a/Hints.py
+++ b/Hints.py
@@ -1161,7 +1161,6 @@ def get_important_check_hint(spoiler: Spoiler, world: World, checked: set[str])
                 and not location.item.name == 'Triforce Piece'
                 and not (location.name == 'Song from Impa' and 'Zeldas Letter' in world.settings.starting_items and 'Zeldas Letter' not in world.settings.shuffle_child_trade)
                 # Special cases where the item is only considered major for important checks hints
-                or location.item.name == 'Biggoron Sword'
                 or location.item.name == 'Double Defense'
                 # Handle make keys not in own dungeon major items
                 or (location.item.type in ('SmallKey', 'SmallKeyRing') and not (world.settings.shuffle_smallkeys == 'dungeon' or world.settings.shuffle_smallkeys == 'vanilla'))
diff --git a/ItemList.py b/ItemList.py
index 0d13f44c9..b07b8b0f0 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -363,7 +363,7 @@ class GetItemId(IntEnum):
     'Eyedrops':                                        ('Item',     True,  GetItemId.GI_EYE_DROPS, {'trade': True}),
     'Claim Check':                                     ('Item',     True,  GetItemId.GI_CLAIM_CHECK, {'trade': True}),
     'Kokiri Sword':                                    ('Item',     True,  GetItemId.GI_SWORD_KOKIRI, None),
-    'Giants Knife':                                    ('Item',     None,  GetItemId.GI_SWORD_KNIFE, None),
+    'Giants Knife':                                    ('Item',     True,  GetItemId.GI_SWORD_KNIFE, None),
     'Deku Shield':                                     ('Item',     None,  GetItemId.GI_SHIELD_DEKU, None),
     'Hylian Shield':                                   ('Item',     None,  GetItemId.GI_SHIELD_HYLIAN, None),
     'Mirror Shield':                                   ('Item',     True,  GetItemId.GI_SHIELD_MIRROR, None),
@@ -394,7 +394,7 @@ class GetItemId(IntEnum):
     'Gerudo Mask':                                     ('Item',     None,  GetItemId.GI_MASK_GERUDO, {'trade': True, 'object': 0x0152}),
     'Rupees (50)':                                     ('Item',     None,  GetItemId.GI_RUPEE_PURPLE, {'junk': 1}),
     'Rupees (200)':                                    ('Item',     None,  GetItemId.GI_RUPEE_GOLD, {'junk': 0}),
-    'Biggoron Sword':                                  ('Item',     None,  GetItemId.GI_SWORD_BIGGORON, None),
+    'Biggoron Sword':                                  ('Item',     True,  GetItemId.GI_SWORD_BIGGORON, None),
     'Fire Arrows':                                     ('Item',     True,  GetItemId.GI_ARROW_FIRE, None),
     'Ice Arrows':                                      ('Item',     True,  GetItemId.GI_ARROW_ICE, None),
     'Blue Fire Arrows':                                ('Item',     True,  GetItemId.GI_ARROW_ICE, None),
diff --git a/SettingsListTricks.py b/SettingsListTricks.py
index cfa4dd66d..578eca8db 100644
--- a/SettingsListTricks.py
+++ b/SettingsListTricks.py
@@ -2872,6 +2872,14 @@
                     You can also do the same by abusing invincibility frames
                     if not on ohko.
                     '''},
+   '(Advanced) Water Temple Before Boss Iron Boots Dive Ledgegrab': {
+        'name'    : 'adv_irons_dive',
+        'tags'    : ("Glitchless","Adult","Water Temple","Water Temple MQ",),
+        'tooltip' : '''\
+                    After diving in front of the water, equip iron boots
+                    on the frame(s) before resurfacing to preserve velocity
+                    to grab the ledge.
+                    '''},
     '(Glitch) Water Temple Antigrav to Boss Key Area': {
         'name'    : 'glitch_water_bk_area_antigrav',
         'tags'    : ("Glitch","Adult","Water Temple","Water Temple MQ",),
diff --git a/data/Glitched World/Water Temple MQ.json b/data/Glitched World/Water Temple MQ.json
index 860352d5c..42951080e 100644
--- a/data/Glitched World/Water Temple MQ.json	
+++ b/data/Glitched World/Water Temple MQ.json	
@@ -54,6 +54,7 @@
                 (Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
             "Water Temple Before Boss Lower": "can_use(Longshot) or
                 (adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
+                (adv_irons_dive and can_use(Iron_Boots) and Reset_Water_Level) or
                 ((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
                 can_hover",
             "Water Temple After Waterfall Room": "
diff --git a/data/Glitched World/Water Temple.json b/data/Glitched World/Water Temple.json
index 434c0f032..304bcb02e 100644
--- a/data/Glitched World/Water Temple.json	
+++ b/data/Glitched World/Water Temple.json	
@@ -36,6 +36,7 @@
                 (Zora_Tunic or logic_fewer_tunic_requirements) and Hookshot",
             "Water Temple Before Boss": "can_use(Longshot) or
                 (adv_hovers_recoil and can_use(Hover_Boots) and Megaton_Hammer) or
+                (adv_irons_dive and can_use(Iron_Boots) and Raise_Water_Level) or
                 ((can_mega or can_hess or can_superslide) and can_use(Hover_Boots)) or
                 can_hover",
             "Water Temple North Basement": "can_use(Iron_Boots) and (Zora_Tunic or logic_fewer_tunic_requirements)