diff --git a/CHANGELOG.md b/CHANGELOG.md
index 390247d..11e38c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
 # Changelog
 
 ## Update
-Updated for 1.21.11
\ No newline at end of file
+- Improved Stronghold gen to avoid issues
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/loot_table/pale_temple_common.json b/src/main/resources/data/mtr/loot_table/pale_temple_common.json
new file mode 100644
index 0000000..04eb877
--- /dev/null
+++ b/src/main/resources/data/mtr/loot_table/pale_temple_common.json
@@ -0,0 +1,51 @@
+{
+    "type": "minecraft:chest",
+    "pools": [
+        {
+            "rolls": 6,
+            "entries": [
+                {"type":"item","name":"minecraft:soul_lantern","weight":10},
+                {"type":"item","name":"minecraft:glow_lichen","weight":10},
+                {"type":"item","name":"minecraft:pale_hanging_moss","weight":10},
+                {"type":"item","name":"minecraft:pale_moss_carpet","weight":10},
+                {"type":"item","name":"minecraft:pale_moss_block","weight":10},
+                {"type":"item","name":"minecraft:deepslate_bricks","weight":8},
+                {"type":"item","name":"minecraft:iron_bars","weight":6},
+                {"type":"item","name":"minecraft:mossy_cobblestone","weight":6},
+                {"type":"item","name":"minecraft:decorated_pot","weight":6},
+                {"type":"item","name":"minecraft:pale_oak_sapling","weight":5},
+                {"type":"item","name":"minecraft:open_eyeblossom","weight":5},
+                {"type":"item","name":"minecraft:closed_eyeblossom","weight":5},
+                {"type":"item","name":"minecraft:wither_rose","weight":4},
+                {"type":"item","name":"minecraft:leaf_litter","weight":4}
+            ]
+        },
+        {
+            "rolls": 4,
+            "entries": [
+                {"type":"item","name":"minecraft:stick","weight":8},
+                {"type":"item","name":"minecraft:string","weight":8},
+                {"type":"item","name":"minecraft:amethyst_shard","weight":6},
+                {"type":"item","name":"minecraft:iron_nugget","weight":6},
+                {"type":"item","name":"minecraft:leather","weight":5},
+                {"type":"item","name":"minecraft:bone","weight":5},
+                {"type":"item","name":"minecraft:potato","weight":5},
+                {"type":"item","name":"minecraft:feather","weight":5},
+                {"type":"item","name":"minecraft:book","weight":4},
+                {"type":"item","name":"minecraft:bowl","weight":4},
+                {"type":"item","name":"minecraft:glass_bottle","weight":4}
+            ]
+        },
+        {
+            "rolls": 1,
+            "entries": [
+                {"type":"item","name":"minecraft:chainmail_helmet","weight":2},
+                {"type":"item","name":"minecraft:chainmail_chestplate","weight":2},
+                {"type":"item","name":"minecraft:chainmail_leggings","weight":2},
+                {"type":"item","name":"minecraft:chainmail_boots","weight":2},
+                {"type":"item","name":"minecraft:stone_sword","weight":2},
+                {"type":"item","name":"minecraft:shield","weight":2}
+            ]
+        }
+    ]
+}
diff --git a/src/main/resources/data/mtr/loot_table/pale_temple_rare.json b/src/main/resources/data/mtr/loot_table/pale_temple_rare.json
new file mode 100644
index 0000000..2271ef8
--- /dev/null
+++ b/src/main/resources/data/mtr/loot_table/pale_temple_rare.json
@@ -0,0 +1,56 @@
+{
+    "type": "minecraft:chest",
+    "pools": [
+        {
+            "name": "rare_items",
+            "rolls": 4,
+            "entries": [
+                {"type":"item","name":"minecraft:diamond","weight":8},
+                {"type":"item","name":"minecraft:emerald","weight":8},
+                {"type":"item","name":"minecraft:raw_iron","weight":6},
+                {"type":"item","name":"minecraft:gold_nugget","weight":6},
+                {"type":"item","name":"minecraft:iron_nugget","weight":6},
+                {"type":"item","name":"minecraft:golden_carrot","weight":5},
+                {"type":"item","name":"minecraft:cooked_chicken","weight":5},
+                {"type":"item","name":"minecraft:honeycomb","weight":4},
+                {"type":"item","name":"minecraft:large_amethyst_bud","weight":4},
+                {"type":"item","name":"minecraft:wither_rose","weight":3},
+                {"type":"item","name":"minecraft:glow_lichen","weight":3},
+                {"type":"item","name":"minecraft:cobweb","weight":2},
+                {"type":"item","name":"minecraft:experience_bottle","weight":3},
+                {"type":"item","name":"minecraft:book","weight": 3,"functions":[{"function":"enchant_randomly"}]}
+            ]
+        },
+        {
+            "name": "common_items",
+            "rolls": 6,
+            "entries": [
+                {"type":"item","name":"minecraft:redstone","weight":8},
+                {"type":"item","name":"minecraft:flint","weight":6},
+                {"type":"item","name":"minecraft:book","weight":6},
+                {"type":"item","name":"minecraft:glistering_melon_slice","weight":6},
+                {"type":"item","name":"minecraft:pale_hanging_moss","weight":5},
+                {"type":"item","name":"minecraft:rooted_dirt","weight":5},
+                {"type":"item","name":"minecraft:deepslate","weight":5},
+                {"type":"item","name":"minecraft:red_mushroom","weight":4},
+                {"type":"item","name":"minecraft:brown_mushroom","weight":4}
+            ]
+        },
+        {
+            "name": "equipment_weapons",
+            "rolls": 2,
+            "entries": [
+                {"type":"item","name":"minecraft:iron_sword","weight":2},
+                {"type":"item","name":"minecraft:copper_sword","weight":2},
+                {"type":"item","name":"minecraft:diamond_helmet","weight":1},
+                {"type":"item","name":"minecraft:diamond_chestplate","weight":1},
+                {"type":"item","name":"minecraft:diamond_leggings","weight":1},
+                {"type":"item","name":"minecraft:diamond_boots","weight":1},
+                {"type":"item","name":"minecraft:iron_axe","weight":2},
+                {"type":"item","name":"minecraft:crossbow","weight":2},
+                {"type":"item","name":"minecraft:iron_horse_armor","weight":1},
+                {"type":"item","name":"minecraft:saddle","weight":1}
+            ]
+        }
+    ]
+}
diff --git a/src/main/resources/data/mtr/structure/pale_temple/pale_temple.nbt b/src/main/resources/data/mtr/structure/pale_temple/pale_temple.nbt
new file mode 100644
index 0000000..854475f
Binary files /dev/null and b/src/main/resources/data/mtr/structure/pale_temple/pale_temple.nbt differ
diff --git a/src/main/resources/data/mtr/structure/pale_temple/pale_temple_1.nbt b/src/main/resources/data/mtr/structure/pale_temple/pale_temple_1.nbt
new file mode 100644
index 0000000..f7debef
Binary files /dev/null and b/src/main/resources/data/mtr/structure/pale_temple/pale_temple_1.nbt differ
diff --git a/src/main/resources/data/mtr/structure/pale_temple/pale_temple_2.nbt b/src/main/resources/data/mtr/structure/pale_temple/pale_temple_2.nbt
new file mode 100644
index 0000000..ecfaf58
Binary files /dev/null and b/src/main/resources/data/mtr/structure/pale_temple/pale_temple_2.nbt differ
diff --git a/src/main/resources/data/mtr/tags/worldgen/biome/has_structure/pale_biomes.json b/src/main/resources/data/mtr/tags/worldgen/biome/has_structure/pale_biomes.json
new file mode 100644
index 0000000..819afba
--- /dev/null
+++ b/src/main/resources/data/mtr/tags/worldgen/biome/has_structure/pale_biomes.json
@@ -0,0 +1,8 @@
+{
+  "replace": false,
+
+  "_comment": " This biome tag can specify the biome directly. Or specify another biome tag by starting with # ",
+  "values": [
+    "minecraft:pale_garden"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/worldgen/structure/pale_temple.json b/src/main/resources/data/mtr/worldgen/structure/pale_temple.json
new file mode 100644
index 0000000..b985cd3
--- /dev/null
+++ b/src/main/resources/data/mtr/worldgen/structure/pale_temple.json
@@ -0,0 +1,36 @@
+{
+    "type": "moogs_structures:moogs_structures_generic_jigsaw_structure",
+    "start_pool": "mtr:pale_temple/start_pool",
+    "size": 10,
+    "project_start_to_heightmap": "WORLD_SURFACE_WG",
+    "terrain_height_radius_check": 2,
+    "allowed_terrain_height_range": 5,
+    "valid_biome_radius_check": 4,
+    "liquid_settings": "ignore_waterlogging",
+    "biomes": "#mtr:has_structure/pale_biomes",
+    "step": "surface_structures",
+    "terrain_adaptation": "beard_thin",
+    "cannot_spawn_in_liquid": true,
+    "start_height": {
+        "absolute": 0
+    },
+    "spawn_overrides": {
+        "monster": {
+            "bounding_box": "piece",
+            "spawns": [
+                {
+                    "type": "minecraft:skeleton",
+                    "weight": 10,
+                    "minCount": 2,
+                    "maxCount": 6
+                },
+                {
+                    "type": "minecraft:spider",
+                    "weight": 10,
+                    "minCount": 1,
+                    "maxCount": 3
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/worldgen/structure/stronghold.json b/src/main/resources/data/mtr/worldgen/structure/stronghold.json
index 3ea1907..d2fc7f7 100644
--- a/src/main/resources/data/mtr/worldgen/structure/stronghold.json
+++ b/src/main/resources/data/mtr/worldgen/structure/stronghold.json
@@ -4,6 +4,10 @@
     "jigsaw": "mtr:stronghold_side_pool",
     "size": 30,
     "project_start_to_heightmap": "WORLD_SURFACE_WG",
+    "y_allowance":
+    {
+        "min_y_allowed": 70
+    },
     "biomes": "#mtr:has_structure/overworld_biomes",
     "step": "surface_structures",
     "terrain_adaptation": "bury",
diff --git a/src/main/resources/data/mtr/worldgen/structure_set/pale_temple.json b/src/main/resources/data/mtr/worldgen/structure_set/pale_temple.json
new file mode 100644
index 0000000..49a7471
--- /dev/null
+++ b/src/main/resources/data/mtr/worldgen/structure_set/pale_temple.json
@@ -0,0 +1,14 @@
+{
+    "structures": [
+        {
+            "structure": "mtr:pale_temple",
+            "weight": 1
+        }
+    ],
+    "placement": {
+        "type": "moogs_structures:advanced_random_spread",
+        "salt": 644471789,
+        "spacing": 60,
+        "separation": 30
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_1.json b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_1.json
new file mode 100644
index 0000000..0e50899
--- /dev/null
+++ b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_1.json
@@ -0,0 +1,15 @@
+{
+    "name": "pale_temple/side_pool_1",
+    "fallback": "minecraft:empty",
+    "elements": [
+        {
+            "weight": 1,
+            "element": {
+                "element_type": "minecraft:single_pool_element",
+                "projection": "rigid",
+                "location": "mtr:pale_temple/pale_temple_1",
+                "processors": "minecraft:empty"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_2.json b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_2.json
new file mode 100644
index 0000000..7884c22
--- /dev/null
+++ b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/side_pool_2.json
@@ -0,0 +1,15 @@
+{
+    "name": "pale_temple/side_pool_2",
+    "fallback": "minecraft:empty",
+    "elements": [
+        {
+            "weight": 1,
+            "element": {
+                "element_type": "minecraft:single_pool_element",
+                "projection": "rigid",
+                "location": "mtr:pale_temple/pale_temple_2",
+                "processors": "minecraft:empty"
+            }
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/start_pool.json b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/start_pool.json
new file mode 100644
index 0000000..8eedb52
--- /dev/null
+++ b/src/main/resources/data/mtr/worldgen/template_pool/pale_temple/start_pool.json
@@ -0,0 +1,15 @@
+{
+    "name": "mtr:pale_temple/start_pool",
+    "fallback": "minecraft:empty",
+    "elements": [
+        {
+            "weight": 1,
+            "element": {
+                "location": "mtr:pale_temple/pale_temple",
+                "processors": "minecraft:empty",
+                "projection": "rigid",
+                "element_type": "minecraft:single_pool_element"
+            }
+        }
+    ]
+}
\ No newline at end of file