diff --git a/mods/ctf_map/maps/03_caverns.conf b/mods/ctf_map/maps/03_caverns.conf
new file mode 100644
index 0000000..2087525
--- /dev/null
+++ b/mods/ctf_map/maps/03_caverns.conf
@@ -0,0 +1,11 @@
+name = Caverns
+author = rubenwardy
+rotation = z
+r = 115
+h = 230
+team.1 = red
+team.1.color = red
+team.1.pos = -20,-2,65
+team.2 = blue
+team.2.color = blue
+team.2.pos = -48,0,-83
diff --git a/mods/ctf_map/maps/03_caverns.mts b/mods/ctf_map/maps/03_caverns.mts
new file mode 100644
index 0000000..e0efb07
Binary files /dev/null and b/mods/ctf_map/maps/03_caverns.mts differ
diff --git a/mods/ctf_map/nodes.lua b/mods/ctf_map/nodes.lua
index 0c08475..5e0bf26 100644
--- a/mods/ctf_map/nodes.lua
+++ b/mods/ctf_map/nodes.lua
@@ -34,10 +34,17 @@ minetest.register_node("ctf_map:ind_stone", {
 	is_ground_content = false
 })
 
+minetest.register_node("ctf_map:ind_stone_red", {
+	description = "Cheater!",
+	groups = {immortal = 1},
+	tiles = {"ctf_map_stone_red.png"},
+	is_ground_content = false
+})
+
 minetest.register_node("ctf_map:ind_glass_red", {
 	description = "You cheater you!",
 	drawtype = "glasslike",
-	tiles = {"ctf_map_red.png"},
+	tiles = {"ctf_map_glass_red.png"},
 	inventory_image = minetest.inventorycube("default_glass.png"),
 	paramtype = "light",
 	sunlight_propagates = true,
diff --git a/mods/ctf_map/schem_map.lua b/mods/ctf_map/schem_map.lua
index e2063a6..8fb80fd 100644
--- a/mods/ctf_map/schem_map.lua
+++ b/mods/ctf_map/schem_map.lua
@@ -70,6 +70,12 @@ ctf_match.register_on_new_match(function()
 	local name = ctf_map.available_maps[math.random(#ctf_map.available_maps)]
 	ctf_map.map = ctf_match.load_map_meta(name)
 	ctf_map.place_map(ctf_map.map)
+
+	minetest.after(0.1, function()
+		for _, player in pairs(minetest.get_connected_players()) do
+			ctf.move_to_spawn(player:get_player_name())
+		end
+	end)
 end)
 
 function ctf_match.create_teams()
diff --git a/mods/ctf_map/textures/ctf_map_red.png b/mods/ctf_map/textures/ctf_map_glass_red.png
similarity index 100%
rename from mods/ctf_map/textures/ctf_map_red.png
rename to mods/ctf_map/textures/ctf_map_glass_red.png
diff --git a/mods/ctf_map/textures/ctf_map_stone_red.png b/mods/ctf_map/textures/ctf_map_stone_red.png
new file mode 100644
index 0000000..ff72d3e
Binary files /dev/null and b/mods/ctf_map/textures/ctf_map_stone_red.png differ