diff --git a/BaseClasses.py b/BaseClasses.py
index fe1f3c96..73882607 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -148,7 +148,7 @@ class World(object):
             set_player_attr('door_self_loops', False)
             set_player_attr('door_type_mode', 'original')
             set_player_attr('trap_door_mode', 'optional')
-            set_player_attr('key_logic_algorithm', 'default')
+            set_player_attr('key_logic_algorithm', 'partial')
             set_player_attr('aga_randomness', True)
 
             set_player_attr('shopsanity', False)
diff --git a/CLI.py b/CLI.py
index 38af7c52..1066b845 100644
--- a/CLI.py
+++ b/CLI.py
@@ -216,7 +216,7 @@ def parse_settings():
         'intensity': 2,
         'door_type_mode': 'original',
         'trap_door_mode': 'optional',
-        'key_logic_algorithm': 'default',
+        'key_logic_algorithm': 'partial',
         'decoupledoors': False,
         'door_self_loops': False,
         'experimental': False,
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index fdc4dd0a..933f5b87 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -143,6 +143,8 @@ These are now independent of retro mode and have three options: None, Random, an
 
 * 1.4.0.0v
   * Initial support for HMG (Thanks Muffins!)
+  * Generation: fix for bunny walk logic taking up too much memory
+  * Key Logic: Partial is now the new default
   * Enemizer: enemy bans
 * 1.3.0.9v
   * ER: New Swapped ER mode borrowed from OWR
diff --git a/Rules.py b/Rules.py
index deb809a4..f5977389 100644
--- a/Rules.py
+++ b/Rules.py
@@ -1945,14 +1945,16 @@ def set_bunny_rules(world, player, inverted):
         #    a) being able to reach it, and
         #    b) being able to access all entrances from there to `region`
         queue = deque([(region, [], {region})])
+        seen_sets = set([frozenset({region})])
         while queue:
             (current, path, seen) = queue.popleft()
             for entrance in current.entrances:
                 new_region = entrance.parent_region
-                if new_region.type in (RegionType.Cave, RegionType.Dungeon) and new_region in seen:
+                new_seen = seen.union({new_region})
+                if new_region.type in (RegionType.Cave, RegionType.Dungeon) and new_seen in seen_sets:
                     continue
                 new_path = path + [entrance.access_rule]
-                new_seen = seen.union({new_region})
+                seen_sets.add(frozenset(new_seen))
                 if not is_link(new_region):
                     if world.logic[player] in ['owglitches', 'hybridglitches']:
                         if region.type == RegionType.Dungeon and new_region.type != RegionType.Dungeon:
@@ -1997,6 +1999,7 @@ def set_bunny_rules(world, player, inverted):
                     else:
                         continue
                 if is_bunny(new_region):
+                    # todo: if not owg or hmg and entrance is in bunny_impassible_doors, then skip this nonsense?
                     queue.append((new_region, new_path, new_seen))
                 else:
                     # we have reached pure light world, so we have a new possible option