diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua
index 2ac0c25ee..141530643 100644
--- a/mods/CORE/mcl_init/init.lua
+++ b/mods/CORE/mcl_init/init.lua
@@ -30,7 +30,7 @@ local minecraft_height_limit = 320
 local superflat = mg_name == "flat" and minetest.get_mapgen_setting("mcl_superflat_classic") == "true"
 local singlenode = mg_name == "singlenode"
 
-local convert_old_bedrock = minetest.settings:get_bool("convert_old_bedrock", true)
+local convert_old_bedrock = minetest.settings:get_bool("mcl_convert_old_bedrock", false)
 
 -- Calculate mapgen_edge_min/mapgen_edge_max
 mcl_vars.chunksize = math.max(1, tonumber(minetest.get_mapgen_setting("chunksize")) or 5)
@@ -267,22 +267,37 @@ function mcl_vars.get_node(p, force, us_timeout)
 end
 
 -- lbm to update from old mapgen depth to new. potentially affects a lot of nodes inducing lag.
-if convert_old_bedrock then
+-- Also it will not generate ores or bedrock pattern.
+local function register_lbms()
 	minetest.register_lbm({
-			label = "Replace bedrock from old bedrock layer and air/void below to deepslate",
-			name = ":mcl_mapgen_core:replace_old_bedrock",
-			nodenames = { "mcl_core:bedrock","mcl_core:void","mcl_core:barrier"},
-			run_at_every_load = false,
-			action = function(p)
-				if p.y >= mcl_vars.mg_overworld_min and
-					p.y <= mcl_vars.mg_overworld_min_old + 5 -- 
-				then
-					if p.y <= mcl_vars.mg_bedrock_overworld_max and p.y >= mcl_vars.mg_bedrock_overworld_min then
-						minetest.swap_node(p,{name="mcl_core:bedrock" }) --TODO: bedrock pattern
-					else
-						minetest.swap_node(p,{name="mcl_deepslate:deepslate" })
-					end
+		label = "Replace bedrock from old bedrock layer and air/void below to deepslate",
+		name = ":mcl_mapgen_core:replace_old_bedrock",
+		nodenames = { "mcl_core:bedrock" },
+		run_at_every_load = true,
+		action = function(p)
+			if p.y >= mcl_vars.mg_overworld_min_old - 1 and p.y <= mcl_vars.mg_overworld_min_old + 5 then
+				minetest.swap_node(p,{name="mcl_deepslate:deepslate"})
+			end
+			--minetest.log("bedrock")
+		end
+	})
+	minetest.register_lbm({
+		label = "Replace bedrock from old bedrock layer and air/void below to deepslate",
+		name = ":mcl_mapgen_core:replace_old_void",
+		nodenames = { "mcl_core:void" },
+		run_at_every_load = true,
+		action = function(p)
+			if p.y <= mcl_vars.mg_overworld_min_old and p.y >= mcl_vars.mg_bedrock_overworld_min then
+				if p.y <= mcl_vars.mg_bedrock_overworld_max and p.y >= mcl_vars.mg_bedrock_overworld_min then
+					minetest.swap_node(p,{name="mcl_core:bedrock" })
+				else
+					minetest.swap_node(p,{name="mcl_deepslate:deepslate"})
 				end
-			end,
+			end
+			--minetest.log("void")
+		end
 	})
 end
+if convert_old_bedrock then
+	register_lbms()
+end
diff --git a/mods/ITEMS/mcl_deepslate/init.lua b/mods/ITEMS/mcl_deepslate/init.lua
index 6b03358e2..800ea2bd1 100644
--- a/mods/ITEMS/mcl_deepslate/init.lua
+++ b/mods/ITEMS/mcl_deepslate/init.lua
@@ -1,21 +1,20 @@
 local modname = minetest.get_current_modname()
 local S = minetest.get_translator(modname)
 
---local layer_max = mcl_worlds.layer_to_y(16)
---local layer_min = mcl_vars.mg_overworld_min
+local layer_max = mcl_vars.mg_overworld_min_old
+local layer_min = mcl_vars.mg_overworld_min
 
 local copper_mod = minetest.get_modpath("mcl_copper")
 
 local cobble = "mcl_deepslate:deepslate_cobbled"
 local stick = "mcl_core:stick"
 
---[[
+
 local mountains = {
 	"ExtremeHills", "ExtremeHills_beach", "ExtremeHills_ocean", "ExtremeHills_deep_ocean", "ExtremeHills_underground",
 	"ExtremeHills+", "ExtremeHills+_ocean", "ExtremeHills+_deep_ocean", "ExtremeHills+_underground",
 	"ExtremeHillsM", "ExtremeHillsM_ocean", "ExtremeHillsM_deep_ocean", "ExtremeHillsM_underground",
 }
-]]
 
 minetest.register_node("mcl_deepslate:deepslate", {
 	description = S("Deepslate"),
@@ -205,7 +204,6 @@ minetest.register_craft({
 	cooktime = 10,
 })
 
---[[ Commented out for now because there the discussion how to handle this is ongoing
 minetest.register_ore({
     ore_type       = "blob",
     ore            = "mcl_deepslate:deepslate",
@@ -364,7 +362,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then
 		})
 	end
 end
---]]
+
 local function register_deepslate_variant(item, desc, longdesc)
 	local texture = desc:lower():gsub("% ", "_")
 	local def = {