diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4ae675a6..a84d0551 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -110,6 +110,8 @@ These are now independent of retro mode and have three options: None, Random, an
 # Bug Fixes and Notes
 
 * 1.2.0.16u
+  * Fix for partial key logic on vanilla Mire
+  * Fix for Kholdstare Shell collision when at Lanmo 2
   * Fix for Mire Attic Hint door (direction was swapped)
   * Dungeon at Chest Game displays correctly on OW map option
 * 1.2.0.15u
diff --git a/Rom.py b/Rom.py
index b7285b2e..ea0b9c68 100644
--- a/Rom.py
+++ b/Rom.py
@@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '29863ca305a8474c452cd13b3f921898'
+RANDOMIZERBASEHASH = '9903cdfc3fc69112919ec49fb63e09ab'
 
 
 class JsonRom(object):
diff --git a/Rules.py b/Rules.py
index e8dc7aa5..fc608ec2 100644
--- a/Rules.py
+++ b/Rules.py
@@ -2000,7 +2000,9 @@ def add_key_logic_rules(world, player):
     key_logic = world.key_logic[player]
     eval_func = eval_small_key_door
     if world.key_logic_algorithm[player] == 'strict' and world.keyshuffle[player] == 'wild':
-         eval_func = eval_small_key_door_strict
+        eval_func = eval_small_key_door_strict
+    elif world.key_logic_algorithm[player] != 'default':
+        eval_func = eval_small_key_door_partial
     for d_name, d_logic in key_logic.items():
         for door_name, rule in d_logic.door_rules.items():
             door_entrance = world.get_entrance(door_name, player)
@@ -2056,6 +2058,36 @@ def eval_small_key_door_main(state, door_name, dungeon, player):
     return door_openable
 
 
+def eval_small_key_door_partial_main(state, door_name, dungeon, player):
+    if state.is_door_open(door_name, player):
+        return True
+    key_logic = state.world.key_logic[player][dungeon]
+    if door_name not in key_logic.door_rules:
+        return False
+    door_rule = key_logic.door_rules[door_name]
+    door_openable = False
+    for ruleType, number in door_rule.new_rules.items():
+        if door_openable:
+            return True
+        if ruleType == KeyRuleType.WorstCase:
+            number = min(number, door_rule.small_key_num)
+            door_openable |= state.has_sm_key(key_logic.small_key_name, player, number)
+        elif ruleType == KeyRuleType.AllowSmall:
+            small_loc_item = door_rule.small_location.item
+            if small_loc_item and small_loc_item.name == key_logic.small_key_name and small_loc_item.player == player:
+                door_openable |= state.has_sm_key(key_logic.small_key_name, player, number)
+        elif isinstance(ruleType, tuple):
+            lock, lock_item = ruleType
+            # this doesn't track logical locks yet, i.e. hammer locks the item and hammer is there, but the item isn't
+            for loc in door_rule.alternate_big_key_loc:
+                spot = state.world.get_location(loc, player)
+                if spot.item and spot.item.name == lock_item:
+                    number = min(number, door_rule.alternate_small_key)
+                    door_openable |= state.has_sm_key(key_logic.small_key_name, player, number)
+                    break
+    return door_openable
+
+
 def eval_small_key_door_strict_main(state, door_name, dungeon, player):
     if state.is_door_open(door_name, player):
         return True
@@ -2070,6 +2102,10 @@ def eval_small_key_door(door_name, dungeon, player):
     return lambda state: eval_small_key_door_main(state, door_name, dungeon, player)
 
 
+def eval_small_key_door_partial(door_name, dungeon, player):
+    return lambda state: eval_small_key_door_partial_main(state, door_name, dungeon, player)
+
+
 def eval_small_key_door_strict(door_name, dungeon, player):
     return lambda state: eval_small_key_door_strict_main(state, door_name, dungeon, player)
 
diff --git a/data/base2current.bps b/data/base2current.bps
index 832779a3..e58c28ab 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ