diff --git a/ItemList.py b/ItemList.py
index 64993ae5..e37162d6 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -255,7 +255,7 @@ def generate_itempool(world, player):
         (pool, placed_items, precollected_items, clock_mode, treasure_hunt_count, treasure_hunt_icon, lamps_needed_for_dark_rooms) = make_custom_item_pool(world.progressive, world.shuffle[player], world.difficulty[player], world.timer, world.goal[player], world.mode[player], world.swords[player], world.retro[player], world.customitemarray)
         world.rupoor_cost = min(world.customitemarray[player]["rupoorcost"], 9999)
     else:
-        (pool, placed_items, precollected_items, clock_mode, lamps_needed_for_dark_rooms) = get_pool_core(world.progressive, world.shuffle[player], world.difficulty[player], world.treasure_hunt_total[player], world.timer, world.goal[player], world.mode[player], world.swords[player], world.retro[player], world.doorShuffle[player], world.logic[player])
+        (pool, placed_items, precollected_items, clock_mode, lamps_needed_for_dark_rooms) = get_pool_core(world.progressive, world.owShuffle[player], world.owSwap[player], world.shuffle[player], world.difficulty[player], world.treasure_hunt_total[player], world.timer, world.goal[player], world.mode[player], world.swords[player], world.retro[player], world.doorShuffle[player], world.logic[player])
 
     if player in world.pool_adjustment.keys():
         amt = world.pool_adjustment[player]
@@ -710,7 +710,7 @@ rupee_chart = {'Rupee (1)': 1, 'Rupees (5)': 5, 'Rupees (20)': 20, 'Rupees (50)'
                'Rupees (100)': 100, 'Rupees (300)': 300}
 
 
-def get_pool_core(progressive, shuffle, difficulty, treasure_hunt_total, timer, goal, mode, swords, retro, door_shuffle, logic):
+def get_pool_core(progressive, owShuffle, owSwap, shuffle, difficulty, treasure_hunt_total, timer, goal, mode, swords, retro, door_shuffle, logic):
     pool = []
     placed_items = {}
     precollected_items = []
@@ -734,6 +734,12 @@ def get_pool_core(progressive, shuffle, difficulty, treasure_hunt_total, timer,
         precollected_items.append('Pegasus Boots')
         pool.remove('Pegasus Boots')
         pool.extend(['Rupees (20)'])
+    
+    if owSwap in ['mixed', 'crossed'] and owShuffle == 'vanilla':
+        precollected_items.append('Bombs (3)')
+        precollected_items.append('Rupees (5)')
+        precollected_items.append('Rupees (5)')
+        precollected_items.append('Rupees (5)')
 
     if want_progressives():
         pool.extend(progressivegloves)
@@ -968,19 +974,21 @@ def test():
                                 for logic in ['noglitches', 'minorglitches', 'owglitches', 'nologic']:
                                     for retro in [True, False]:
                                         for door_shuffle in ['basic', 'crossed', 'vanilla']:
-                                            out = get_pool_core(progressive, shuffle, difficulty, 30, timer, goal, mode, swords, retro, door_shuffle, logic)
-                                            count = len(out[0]) + len(out[1])
+                                            for owShuffle in ['full', 'vanilla']:
+                                                for owSwap in ['mixed', 'vanilla']:
+                                                    out = get_pool_core(progressive, owShuffle, owSwap, shuffle, difficulty, 30, timer, goal, mode, swords, retro, door_shuffle, logic)
+                                                    count = len(out[0]) + len(out[1])
 
-                                            correct_count = total_items_to_place
-                                            if goal == 'pedestal' and swords != 'vanilla':
-                                                # pedestal goals generate one extra item
-                                                correct_count += 1
-                                            if retro:
-                                                correct_count += 28
-                                            try:
-                                                assert count == correct_count, "expected {0} items but found {1} items for {2}".format(correct_count, count, (progressive, shuffle, difficulty, timer, goal, mode, swords, retro))
-                                            except AssertionError as e:
-                                                print(e)
+                                                    correct_count = total_items_to_place
+                                                    if goal == 'pedestal' and swords != 'vanilla':
+                                                        # pedestal goals generate one extra item
+                                                        correct_count += 1
+                                                    if retro:
+                                                        correct_count += 28
+                                                    try:
+                                                        assert count == correct_count, "expected {0} items but found {1} items for {2}".format(correct_count, count, (progressive, shuffle, difficulty, timer, goal, mode, swords, retro))
+                                                    except AssertionError as e:
+                                                        print(e)
 
 if __name__ == '__main__':
     test()