diff --git a/biomes.lua b/biomes.lua
index 8222bbb..ed1d02a 100644
--- a/biomes.lua
+++ b/biomes.lua
@@ -98,13 +98,14 @@ subterrane:register_cave_layer({
 subterrane:register_cave_layer({
 	minimum_depth = dfcaverns.config.level3_min,
 	maximum_depth = dfcaverns.config.lava_sea_min,
+	cave_threshold = 0.1
 })
 
-subterrane:register_cave_layer({
-	minimum_depth = dfcaverns.config.lava_sea_min,
-	maximum_depth = dfcaverns.config.ymin,
-	cave_threshold = 0.3,
-})
+--subterrane:register_cave_layer({
+--	minimum_depth = dfcaverns.config.lava_sea_min,
+--	maximum_depth = dfcaverns.config.ymin,
+--	cave_threshold = 0.3,
+--})
 
 dfcaverns.can_support_vegetation = {[c_sand] = true, [c_dirt] = true, [c_coal_ore] = true, [c_gravel] = true}
 
diff --git a/biomes/lava_sea.lua b/biomes/lava_sea.lua
index 241df31..8f7029a 100644
--- a/biomes/lava_sea.lua
+++ b/biomes/lava_sea.lua
@@ -13,14 +13,27 @@ local c_cavern_fungi = minetest.get_content_id("dfcaverns:cavern_fungi") -- para
 
 -------------------------------------------------------------------------------------------
 
+local subsea_level = (dfcaverns.config.lava_sea_min - dfcaverns.config.level3_min) * 0.3 + dfcaverns.config.level3_min
+minetest.debug("level3_min", dfcaverns.config.level3_min)
+minetest.debug("lava subsea", subsea_level)
+minetest.debug("lava_sea_min", dfcaverns.config.lava_sea_min)
 
 minetest.register_biome({
-	name = "dfcaverns_lava_sea",
+	name = "dfcaverns_lava_sea_lower",
 	y_min = dfcaverns.config.lava_sea_min,
+	y_max = subsea_level,
+	heat_point = 50,
+	humidity_point = 50,
+	_subterrane_fill_node = c_lava,
+	_subterrane_cave_fill_node = c_lava,
+})
+
+minetest.register_biome({
+	name = "dfcaverns_lava_sea_upper",
+	y_min = subsea_level,
 	y_max = dfcaverns.config.level3_min,
 	heat_point = 50,
 	humidity_point = 50,
-	_subterrane_fill_node = c_air, -- It's proving tricky to get lava-flooded caves without spilling into forested ones, temporarily disabling until a better solution is found.
-	_subterrane_cave_fill_node = c_air,
+	_subterrane_fill_node = c_air,
+	_subterrane_cave_fill_node = c_lava,
 })
-
diff --git a/biomes/level3.lua b/biomes/level3.lua
index 7ddfc9d..f9f4267 100644
--- a/biomes/level3.lua
+++ b/biomes/level3.lua
@@ -457,9 +457,9 @@ minetest.register_biome({
 minetest.register_biome({
 	name = "dfcaverns_level3_tunnel_tube_biome_lower",
 	y_min = dfcaverns.config.level3_min,
+	y_max = subsea_level,
 	heat_point = 60,
 	humidity_point = 40,
-	y_max = subsea_level,
 	_subterrane_ceiling_decor = level_3_moist_ceiling,
 	_subterrane_floor_decor = level_3_tunnel_tube_floor,
 	_subterrane_fill_node = c_air,
@@ -499,7 +499,7 @@ minetest.register_biome({
 minetest.register_biome({
 	name = "dfcaverns_level3_black_cap_biome_upper",
 	y_min = subsea_level,
-	y_max = dfcaverns.config.level1_min,
+	y_max = dfcaverns.config.level3_min,
 	heat_point = 50,
 	humidity_point = 15,
 	_subterrane_ceiling_decor = level_3_dry_ceiling,