diff --git a/control.lua b/control.lua
index bc0621b7..3961bc8e 100644
--- a/control.lua
+++ b/control.lua
@@ -7,7 +7,9 @@ require "score"
 
 ---- enable maps here ----
 
-require "maps.endless_desert"
+--require "maps.cave_miner"
+require "maps.deep_jungle"
+--require "maps.endless_desert"
 
 -----------------------------
 
diff --git a/maps/deep_jungle.lua b/maps/deep_jungle.lua
index 0a4c4d6d..97962487 100644
--- a/maps/deep_jungle.lua
+++ b/maps/deep_jungle.lua
@@ -4,6 +4,7 @@
 
 local simplex_noise = require 'utils.simplex_noise'
 local event = require 'utils.event' 
+require "maps.tools.lazy_chunk_loader"
 
 local function treasure_chest(position)
 	local p = game.surfaces["deep_jungle"].find_non_colliding_position("wooden-chest",position, 2,0.5)
@@ -100,52 +101,6 @@ function rare_treasure_chest(position)
 	end		
 end
 
-local function secret_shop(pos)
-	local secret_market_items = {		
-    {price = {{"raw-fish", math.random(250,450)}}, offer = {type = 'give-item', item = 'combat-shotgun'}},
-    {price = {{"raw-fish", math.random(75,125)}}, offer = {type = 'give-item', item = 'rocket-launcher'}},
-    {price = {{"raw-fish", math.random(2,4)}}, offer = {type = 'give-item', item = 'piercing-rounds-magazine'}},
-    {price = {{"raw-fish", math.random(8,16)}}, offer = {type = 'give-item', item = 'uranium-rounds-magazine'}},  
-    {price = {{"raw-fish", math.random(8,16)}}, offer = {type = 'give-item', item = 'piercing-shotgun-shell'}},
-    {price = {{"raw-fish", math.random(8,16)}}, offer = {type = 'give-item', item = 'rocket'}},
-    {price = {{"raw-fish", math.random(10,20)}}, offer = {type = 'give-item', item = 'explosive-rocket'}},        
-    {price = {{"raw-fish", math.random(15,30)}}, offer = {type = 'give-item', item = 'explosive-cannon-shell'}},
-    {price = {{"raw-fish", math.random(25,35)}}, offer = {type = 'give-item', item = 'explosive-uranium-cannon-shell'}},   
-    {price = {{"raw-fish", math.random(20,40)}}, offer = {type = 'give-item', item = 'cluster-grenade'}}, 
-	{price = {{"raw-fish", math.random(1,3)}}, offer = {type = 'give-item', item = 'land-mine'}},	
-    {price = {{"raw-fish", math.random(250,500)}}, offer = {type = 'give-item', item = 'modular-armor'}},
-    {price = {{"raw-fish", math.random(1500,3000)}}, offer = {type = 'give-item', item = 'power-armor'}},
-	{price = {{"raw-fish", math.random(18000,23000)}}, offer = {type = 'give-item', item = 'power-armor-mk2'}},
-    {price = {{"raw-fish", math.random(4000,7000)}}, offer = {type = 'give-item', item = 'fusion-reactor-equipment'}},
-    {price = {{"raw-fish", math.random(50,100)}}, offer = {type = 'give-item', item = 'battery-equipment'}},
-    {price = {{"raw-fish", math.random(700,1100)}}, offer = {type = 'give-item', item = 'battery-mk2-equipment'}},
-    {price = {{"raw-fish", math.random(400,700)}}, offer = {type = 'give-item', item = 'belt-immunity-equipment'}},
-    {price = {{"raw-fish", math.random(12000,16000)}}, offer = {type = 'give-item', item = 'night-vision-equipment'}},
-    {price = {{"raw-fish", math.random(300,500)}}, offer = {type = 'give-item', item = 'exoskeleton-equipment'}},
-    {price = {{"raw-fish", math.random(350,500)}}, offer = {type = 'give-item', item = 'personal-roboport-equipment'}},
-    {price = {{"raw-fish", math.random(25,50)}}, offer = {type = 'give-item', item = 'construction-robot'}},
-    {price = {{"raw-fish", math.random(250,450)}}, offer = {type = 'give-item', item = 'energy-shield-equipment'}},
-    {price = {{"raw-fish", math.random(350,550)}}, offer = {type = 'give-item', item = 'personal-laser-defense-equipment'}},    
-    {price = {{"raw-fish", math.random(125,250)}}, offer = {type = 'give-item', item = 'railgun'}},
-    {price = {{"raw-fish", math.random(2,4)}}, offer = {type = 'give-item', item = 'railgun-dart'}},
-	{price = {{"raw-fish", math.random(100,175)}}, offer = {type = 'give-item', item = 'loader'}},
-	{price = {{"raw-fish", math.random(200,350)}}, offer = {type = 'give-item', item = 'fast-loader'}},
-	{price = {{"raw-fish", math.random(400,600)}}, offer = {type = 'give-item', item = 'express-loader'}}
-	}
-	local surface = game.surfaces["deep_jungle"]										
-	local market = surface.create_entity {name = "market", position = pos}
-	market.destructible = false	
-	local market_items_to_add = math.random(8,12)
-	while market_items_to_add >= 0 do		
-		local i = math.random(1,#secret_market_items)
-		if secret_market_items[i] then
-			market.add_market_item(secret_market_items[i])
-			market_items_to_add = market_items_to_add - 1
-			secret_market_items[i] = nil
-		end
-	end
-end
-
 local function get_noise(name, pos)	
 	local seed = game.surfaces[1].map_gen_settings.seed
 	local noise_seed_add = 25000
@@ -190,9 +145,69 @@ local function get_noise(name, pos)
 	end
 end
 
-local function on_chunk_generated(event)
-	local surface = game.surfaces["deep_jungle"]		
-	local tiles = {}	
+table.insert(global.generate_chunk_tiles_functions, function(chunk_piece) 
+	local area = chunk_piece.area
+	local surface = game.surfaces["deep_jungle"] 
+	if chunk_piece.surface ~= surface then return end			
+	local tiles = {}		
+	local entities = surface.find_entities(area)
+	for _, e in pairs(entities) do
+		if e.type == "tree" or e.force.name == "enemy" then
+			e.destroy()				
+		end
+	end		
+	local tile_to_insert = false	
+	for x = 0, 7, 1 do
+		for y = 0, 7, 1 do			
+			local pos_x = area.left_top.x + x
+			local pos_y = area.left_top.y + y
+			local pos = {x = pos_x, y = pos_y}
+			tile_distance_to_center = pos_x^2 + pos_y^2
+			tile_to_insert = false								
+			
+			local noise_3 = get_noise(3, pos)
+			if noise_3 > -0.1 and noise_3 < 0.1 then
+				if noise_3 > -0.05 and noise_3 < 0.05 then
+					tile_to_insert = "water"					
+				end
+				if noise_3 > -0.03 and noise_3 < 0.03 then
+					tile_to_insert = "deepwater"										
+				end
+			else
+				local noise_1 = get_noise(1, pos)
+				local noise_2 = get_noise(2, pos)
+				local noise_4 = get_noise(4, pos)							
+				if noise_4 < -0.8 or noise_4 > 0.8 then tile_to_insert = "dirt-6" end
+				if noise_3 < -0.1 then												
+					if noise_1 > 0.2 then						
+						if noise_1 > 0.8 and tile_distance_to_center > 8000 then
+							 tile_to_insert = "water-green"
+						end
+					end												
+				else																								
+					if noise_2 < -0.2 then						
+						if noise_2 < -0.8 and tile_distance_to_center > 8000 then
+							 tile_to_insert = "water-green"
+						end
+					end
+				end
+			end			
+			
+			if tile_to_insert == false then
+				table.insert(tiles, {name = "grass-1", position = {pos_x,pos_y}}) 
+			else
+				table.insert(tiles, {name = tile_to_insert, position = {pos_x,pos_y}}) 
+			end					
+		end							
+	end
+	surface.set_tiles(tiles,true)	
+end
+)
+
+table.insert(global.generate_chunk_entities_functions, function(chunk_piece)
+	local area = chunk_piece.area
+	local surface = game.surfaces["deep_jungle"] 
+	if chunk_piece.surface ~= surface then return end		
 	local enemy_building_positions = {}
 	local enemy_worm_positions = {}
 	local worm_raffle = {"small-worm-turret", "small-worm-turret", "small-worm-turret", "medium-worm-turret", "medium-worm-turret", "big-worm-turret"}
@@ -200,41 +215,29 @@ local function on_chunk_generated(event)
 	local rock_positions = {}
 	local fish_positions = {}
 	local rare_treasure_chest_positions = {}
-	local treasure_chest_positions = {}
-	local secret_shop_locations = {}	
-	local tree_positions = {}
-	
-	local entities = surface.find_entities(event.area)
-	for _, e in pairs(entities) do
-		if e.type == "tree" or e.force.name == "enemy" then
-			e.destroy()				
-		end
-	end	
-	
-	local tile_to_insert = false	
-	for x = 0, 31, 1 do
-		for y = 0, 31, 1 do			
-			local pos_x = event.area.left_top.x + x
-			local pos_y = event.area.left_top.y + y
+	local treasure_chest_positions = {}	
+	local tree_positions = {}	
+		
+	for x = 0, 7, 1 do
+		for y = 0, 7, 1 do			
+			local pos_x = area.left_top.x + x
+			local pos_y = area.left_top.y + y
 			local pos = {x = pos_x, y = pos_y}
-			tile_distance_to_center = pos_x^2 + pos_y^2
-			tile_to_insert = false								
-			--game.print(#tree_pool)
+			tile_distance_to_center = pos_x^2 + pos_y^2									
+			
 			local noise_3 = get_noise(3, pos)
 			if noise_3 > -0.1 and noise_3 < 0.1 then
-				if noise_3 > -0.05 and noise_3 < 0.05 then
-					tile_to_insert = "water"
+				if noise_3 > -0.05 and noise_3 < 0.05 then					
 					table.insert(fish_positions, pos)
 				end
-				if noise_3 > -0.03 and noise_3 < 0.03 then
-					tile_to_insert = "deepwater"					
+				if noise_3 > -0.03 and noise_3 < 0.03 then										
 					table.insert(fish_positions, pos)
 				end
 			else
 				local noise_1 = get_noise(1, pos)
 				local noise_2 = get_noise(2, pos)
 				local noise_4 = get_noise(4, pos)
-				if tile_distance_to_center > 8000 then
+				if tile_distance_to_center > 10000 then
 					table.insert(enemy_worm_positions, pos)					
 					if noise_4 > -0.1 and noise_4 < 0.1 and noise_1 > 0.3 and noise_2 > 0.3 then
 						table.insert(rock_positions, pos)
@@ -245,10 +248,7 @@ local function on_chunk_generated(event)
 					if noise_1 > 0.2 then
 						table.insert(tree_positions, {"tree-02", pos})
 						table.insert(rare_treasure_chest_positions, pos)
-						table.insert(treasure_chest_positions, pos)
-						if noise_1 > 0.8 and tile_distance_to_center > 8000 then
-							 tile_to_insert = "water-green"
-						end
+						table.insert(treasure_chest_positions, pos)						
 					end						
 					if noise_1 < -0.2 then
 						table.insert(tree_positions, {"tree-04", pos})
@@ -270,24 +270,12 @@ local function on_chunk_generated(event)
 					if noise_2 < -0.2 then
 						table.insert(tree_positions, {"tree-09", pos})
 						table.insert(rare_treasure_chest_positions, pos)
-						table.insert(treasure_chest_positions, pos)
-						if noise_2 < -0.8 and tile_distance_to_center > 8000 then
-							 tile_to_insert = "water-green"
-						end
+						table.insert(treasure_chest_positions, pos)						
 					end
 				end
-			end
-			
-			
-			if tile_to_insert == false then
-				table.insert(tiles, {name = "grass-1", position = {pos_x,pos_y}}) 
-			else
-				table.insert(tiles, {name = tile_to_insert, position = {pos_x,pos_y}}) 
-			end					
+			end								
 		end							
-	end
-	surface.set_tiles(tiles,true)
-	
+	end			
 	
 	for _, p in pairs(enemy_building_positions) do	
 		if math.random(1,40)==1 then			
@@ -316,12 +304,12 @@ local function on_chunk_generated(event)
 		end
 	end			
 	for _, p in pairs(treasure_chest_positions) do	
-		if math.random(1,1000)==1 then 
+		if math.random(1,1250)==1 then 
 			treasure_chest(p)
 		end
 	end
 	for _, p in pairs(rare_treasure_chest_positions) do	
-		if math.random(1,10000)==1 then 
+		if math.random(1,7500)==1 then 
 			rare_treasure_chest(p)
 		end
 	end		
@@ -340,8 +328,9 @@ local function on_chunk_generated(event)
 		  decorative_names[#decorative_names+1] = k
 		end
 	 end	 
-	surface.regenerate_decorative(decorative_names, {{x=math.floor(event.area.left_top.x/32),y=math.floor(event.area.left_top.y/32)}})		
+	surface.regenerate_decorative(decorative_names, {{x=math.floor(area.left_top.x/8),y=math.floor(area.left_top.y/8)}})
 end
+)
 
 local function on_player_joined_game(event)	
 	local player = game.players[event.player_index]
@@ -355,9 +344,9 @@ local function on_player_joined_game(event)
 			["stone"] = {frequency = "normal", size = "normal", richness = "normal"},
 			["copper-ore"] = {frequency = "normal", size = "normal", richness = "normal"},
 			["iron-ore"] = {frequency = "normal", size = "normal", richness = "normal"},
-			["crude-oil"] = {frequency = "normal", size = "normal", richness = "good"},
-			["trees"] = {frequency = "normal", size = "normal", richness = "normal"},
-			["enemy-base"] = {frequency = "normal", size = "normal", richness = "good"}			
+			["crude-oil"] = {frequency = "normal", size = "normal", richness = "normal"},
+			["trees"] = {frequency = "none", size = "none", richness = "none"},
+			["enemy-base"] = {frequency = "none", size = "none", richness = "none"}			
 		}
 		game.map_settings.pollution.pollution_restored_per_tree_damage = 0
 		game.create_surface("deep_jungle", map_gen_settings)		
@@ -380,36 +369,20 @@ local function on_player_joined_game(event)
 	end
 end
 
-local function on_tick(event)			
-	if global.map_pregeneration_is_active then
-		if game.tick % 600 == 0 then
-			local r = 1
-			for x = 1,32,1 do
-				if game.forces.map_pregen.is_chunk_charted(game.surfaces["deep_jungle"], {x,x}) then r = x end
-			end
-			game.print("Map chunks are generating... current radius " .. r, { r=0.22, g=0.99, b=0.99})				
-			if game.forces.map_pregen.is_chunk_charted(game.surfaces["deep_jungle"], {32,32}) then
-				game.print("Map generation done!", { r=0.22, g=0.99, b=0.99})
-				
-				game.players[1].force = game.forces["player"]
-				global.map_pregeneration_is_active = nil
-			end
-		end
-	end		
-end
-
 local function on_marked_for_deconstruction(event)
 	if event.entity.name == "rock-huge" or event.entity.name == "rock-big" or event.entity.name == "sand-rock-big" or event.entity.name == "fish" or event.entity.type == "tree" then
 		event.entity.cancel_deconstruction(game.players[event.player_index].force.name)
 	end
 end
 
-function map_pregen()
-	local radius = 1024
-	if not game.forces.map_pregen then game.create_force("map_pregen") end
-	game.players[1].force = game.forces["map_pregen"]
-	game.forces.map_pregen.chart(game.surfaces["deep_jungle"],{{x = -1 * radius, y = -1 * radius}, {x = radius, y = radius}})
-	global.map_pregeneration_is_active = true
+local function on_entity_died(event)
+	if event.entity.type == "tree" then
+		if math.random(1,8) == 1 then
+			local surface = game.surfaces["deep_jungle"]
+			local p = surface.find_non_colliding_position("small-biter" , event.entity.position, 2, 0.5)			
+			if p then surface.create_entity {name="small-biter", position=event.entity.position} end
+		end
+	end
 end
 	
 function cheat_mode()
@@ -432,7 +405,6 @@ function cheat_mode()
 	end
 end
 
+event.add(defines.events.on_entity_died, on_entity_died)
 event.add(defines.events.on_marked_for_deconstruction, on_marked_for_deconstruction)
-event.add(defines.events.on_chunk_generated, on_chunk_generated)
-event.add(defines.events.on_tick, on_tick)	
 event.add(defines.events.on_player_joined_game, on_player_joined_game)
\ No newline at end of file
diff --git a/maps/endless_desert.lua b/maps/endless_desert.lua
index e0d209de..50463389 100644
--- a/maps/endless_desert.lua
+++ b/maps/endless_desert.lua
@@ -10,9 +10,9 @@ local function get_noise(name, pos)
 	seed = seed + noise_seed_add
 	if name == 1 then
 		local noise = {}
-		noise[1] = simplex_noise.d2(pos.x * 0.01, pos.y * 0.01, seed)
+		noise[1] = simplex_noise.d2(pos.x * 0.001, pos.y * 0.001, seed)
 		seed = seed + noise_seed_add
-		noise[2] = simplex_noise.d2(pos.x * 0.1, pos.y * 0.1, seed)
+		noise[2] = simplex_noise.d2(pos.x * 0.01, pos.y * 0.01, seed)
 		local noise = noise[1] + noise[2] * 0.1
 		return noise
 	end
@@ -48,9 +48,10 @@ local function get_noise(name, pos)
 	end
 end
 
-function generate_chunk_tiles(chunk_piece)
+table.insert(global.generate_chunk_tiles_functions, function(chunk_piece) 
 	local area = chunk_piece.area
-	local surface = chunk_piece.surface		
+	local surface = game.surfaces["endless_desert"] 
+	if chunk_piece.surface ~= surface then return end
 	local tiles = {}		
 	local entities = surface.find_entities(area)
 	for _, e in pairs(entities) do
@@ -67,19 +68,30 @@ function generate_chunk_tiles(chunk_piece)
 			tile_distance_to_center = pos_x^2 + pos_y^2
 			tile_to_insert = false										
 			--local noise_3 = get_noise(3, pos)						
+			local noise_1 = get_noise(1, pos)
+			if noise_1 > 0.3 then 
+				tile_to_insert = "sand-1"
+			end
+			if noise_1 < -0.3 then 
+				tile_to_insert = "sand-2"
+			end
+			
 			if tile_to_insert == false then
 				table.insert(tiles, {name = "sand-3", position = {pos_x,pos_y}}) 
 			else
 				table.insert(tiles, {name = tile_to_insert, position = {pos_x,pos_y}}) 
-			end				
+			end		
+			
 		end							
 	end
 	surface.set_tiles(tiles,true)		
 end
+)
 
-function generate_chunk_entities(chunk_piece)
+table.insert(global.generate_chunk_entities_functions, function(chunk_piece)
 	local area = chunk_piece.area
-	local surface = chunk_piece.surface			
+	local surface = game.surfaces["endless_desert"] 
+	if chunk_piece.surface ~= surface then return end	
 	local enemy_building_positions = {}
 	local enemy_worm_positions = {}
 	local worm_raffle = {"small-worm-turret", "small-worm-turret", "small-worm-turret", "medium-worm-turret", "medium-worm-turret", "big-worm-turret"}
@@ -97,27 +109,12 @@ function generate_chunk_entities(chunk_piece)
 			local pos_y = area.left_top.y + y
 			local pos = {x = pos_x, y = pos_y}
 			tile_distance_to_center = pos_x^2 + pos_y^2
-			if surface.can_place_entity({name="tree-04", position=pos}) then surface.create_entity {name="tree-04", position=pos} end							
-			--local noise_3 = get_noise(3, pos)												
+			--if surface.can_place_entity({name="tree-03", position=pos}) then surface.create_entity {name="tree-03", position=pos} end							
+			local noise_1 = get_noise(1, pos)			
 		end							
 	end
 end
-
-
-function dump(o)
-   if type(o) == 'table' then
-      local s = '{ '
-      for k,v in pairs(o) do
-         if type(k) ~= 'number' then k = '"'..k..'"' end
-         s = s .. '['..k..'] = ' .. dump(v) .. ','
-      end
-      return s .. '} '
-   else
-      return tostring(o)
-   end
-end
-
-	
+)
 
 local function on_player_joined_game(event)	
 	local player = game.players[event.player_index]
@@ -148,8 +145,7 @@ local function on_player_joined_game(event)
 	if player.online_time < 10 then		
 		player.insert {name = 'raw-fish', count = 1}		
 		player.insert {name = 'iron-axe', count = 1}			
-	end
-	
+	end	
 end
 
 local function on_marked_for_deconstruction(event)
@@ -172,7 +168,7 @@ function cheat_mode()
 		surface.daytime = 1
 		game.player.force.research_all_technologies()
 		game.forces["enemy"].evolution_factor = 0.2
-		local chart = 300
+		local chart = 400
 		local surface = game.surfaces["endless_desert"]	
 		game.forces["player"].chart(surface, {lefttop = {x = chart*-1, y = chart*-1}, rightbottom = {x = chart, y = chart}})		
 	end
diff --git a/maps/tools/lazy_chunk_loader.lua b/maps/tools/lazy_chunk_loader.lua
index 21ff2d12..4455dcb4 100644
--- a/maps/tools/lazy_chunk_loader.lua
+++ b/maps/tools/lazy_chunk_loader.lua
@@ -3,16 +3,20 @@
 --by mewmew
 
 local event = require 'utils.event'
+if not global.generate_chunk_tiles_functions then global.generate_chunk_tiles_functions = {} end
+if not global.generate_chunk_entities_functions then global.generate_chunk_entities_functions = {} end
 
 --cut chunks into 8x8 pieces and fill them into global.chunk_pieces
-local function on_chunk_generated(event)	
+local function on_chunk_generated(event)		
+	if not global.generate_chunk_tiles_functions[1] then game.print("No functions found in table: global.generate_chunk_tiles_functions") return end
+	if not global.generate_chunk_entities_functions[1] then game.print("No functions found in table: global.generate_chunk_entities_functions") return end
 	if not global.chunk_pieces then global.chunk_pieces = {} end
 	if not global.chunk_pieces_tile_index then global.chunk_pieces_tile_index = 1 end
 	if not global.chunk_pieces_entity_index then global.chunk_pieces_entity_index = 1 end
-	local a
+	if not global.chunk_pieces_load_speed then global.chunk_pieces_load_speed = 1 end -- max chunk loading speed in 8x8 tile pieces / tick	
 	for pos_y = 0, 24, 8 do
 		for pos_x = 0, 24, 8 do
-			a = {
+			local a = {
 				left_top = {x = event.area.left_top.x + pos_x, y = event.area.left_top.y + pos_y},
 				right_bottom = {x = event.area.left_top.x + pos_x + 8, y = event.area.left_top.y + pos_y + 8}
 			}			
@@ -21,35 +25,49 @@ local function on_chunk_generated(event)
 	end	 
 end
 
---process the pieces lazy, calling generate_chunk_tiles() and generate_chunk_entities()
-local function on_tick()
-	if not generate_chunk_tiles then game.print("no function > generate_chunk_tiles") return end
-	if not generate_chunk_entities then game.print("no function > generate_chunk_entities") return end
-	
+--process the pieces lazy, calling generate_chunk_tiles_functions() and generate_chunk_entities_functions()
+local function on_tick()	
 	if global.chunk_pieces[global.chunk_pieces_tile_index] then		
 		if global.chunk_pieces_tile_index < 4096 then   --4096 for a fast spawn generation
-			for x = 1, 16, 1 do
+			for x = 1, 128, 1 do
 				if global.chunk_pieces[global.chunk_pieces_tile_index] then 
-					generate_chunk_tiles(global.chunk_pieces[global.chunk_pieces_tile_index])
+					for _, f in pairs(global.generate_chunk_tiles_functions) do
+						f(global.chunk_pieces[global.chunk_pieces_tile_index])
+					end
 					global.chunk_pieces_tile_index = global.chunk_pieces_tile_index + 1
 				end
-			end
+			end			
 		else
-			generate_chunk_tiles(global.chunk_pieces[global.chunk_pieces_tile_index])
-			global.chunk_pieces_tile_index = global.chunk_pieces_tile_index + 1
+			for x = 1, global.chunk_pieces_load_speed, 1 do
+				if global.chunk_pieces[global.chunk_pieces_tile_index] then
+					for _, f in pairs(global.generate_chunk_tiles_functions) do
+						f(global.chunk_pieces[global.chunk_pieces_tile_index])
+					end
+					global.chunk_pieces_tile_index = global.chunk_pieces_tile_index + 1
+				end
+			end			
 		end
 	else
 		if global.chunk_pieces[global.chunk_pieces_entity_index] then
 			if global.chunk_pieces_entity_index < 4096 then   --4096 for a fast spawn generation
-				for x = 1, 16, 1 do
-					if global.chunk_pieces[global.chunk_pieces_entity_index] then 
-						generate_chunk_entities(global.chunk_pieces[global.chunk_pieces_entity_index])
+				for x = 1, 128, 1 do
+					if global.chunk_pieces[global.chunk_pieces_entity_index] then
+						for _, f in pairs(global.generate_chunk_entities_functions) do
+							f(global.chunk_pieces[global.chunk_pieces_entity_index])
+						end
 						global.chunk_pieces_entity_index = global.chunk_pieces_entity_index + 1
 					end
-				end
+				end				
 			else
-				generate_chunk_entities(global.chunk_pieces[global.chunk_pieces_entity_index])
-				global.chunk_pieces_entity_index = global.chunk_pieces_entity_index + 1
+				if not global.chunk_fast_spawn_generation_done then global.chunk_fast_spawn_generation_done = true game.print("Spawn generation done!", { r=0.22, g=0.99, b=0.99}) end
+				for x = 1, global.chunk_pieces_load_speed, 1 do
+					if global.chunk_pieces[global.chunk_pieces_entity_index] then 
+						for _, f in pairs(global.generate_chunk_entities_functions) do
+							f(global.chunk_pieces[global.chunk_pieces_entity_index])
+						end
+						global.chunk_pieces_entity_index = global.chunk_pieces_entity_index + 1
+					end
+				end				
 			end
 		end
 	end	
diff --git a/session_data.lua b/session_data.lua
index 913f3082..e5276ade 100644
--- a/session_data.lua
+++ b/session_data.lua
@@ -1,5 +1,5 @@
 local index = {
-"mqQcIlDBSSuYlsqS", "qXANKmjuRGjFRkUW", "WnujFSWDBwXtzJPX", "xdVfyDCCkjGTPkso", "blkCUwDfFaRxezkA", "PEVkYcsbVwnnKWKm", "RmApKqaHBnDdjlUf"
+"blkCUwDfFaRxezkA", "PEVkYcsbVwnnKWKm", "RmApKqaHBnDdjlUf", "eovuYGvdICGhruuU"
 }
 
 local data = {}
diff --git a/session_data/RmApKqaHBnDdjlUf.lua b/session_data/RmApKqaHBnDdjlUf.lua
index 2c9bdfc1..6ebfd286 100644
--- a/session_data/RmApKqaHBnDdjlUf.lua
+++ b/session_data/RmApKqaHBnDdjlUf.lua
@@ -1,5 +1,5 @@
 local playsession = {
-	{"mewmew", {760334}},
+	{"mewmew", {928470}},
 	{"redlabel", {1458920}},
 	{"ANV1L", {236969}},
 	{"opasuke", {1204692}},
@@ -19,8 +19,8 @@ local playsession = {
 	{"doodoori2", {3124}},
 	{"MetonymicalInsanity", {343281}},
 	{"sloeman", {242913}},
-	{"ajicurry", {146979}},
-	{"vvictor", {333060}},
+	{"ajicurry", {150737}},
+	{"vvictor", {334080}},
 	{"TheFlameWillFade", {161797}},
 	{"Chmizuno", {2033}},
 	{"wubwub69_", {179387}},
@@ -94,7 +94,7 @@ local playsession = {
 	{"coreyellow1", {80619}},
 	{"Lagger289", {145721}},
 	{"pigwithtach", {58458}},
-	{"Raijin-Kizuku", {709088}},
+	{"Raijin-Kizuku", {871452}},
 	{"Nikolaus3943", {41712}},
 	{"Dmitry8266", {56145}},
 	{"anmac1", {25061}},
@@ -142,7 +142,7 @@ local playsession = {
 	{"Dominoscraft", {35988}},
 	{"llamaben54", {5427}},
 	{"amferes", {20625}},
-	{"Terarink", {728230}},
+	{"Terarink", {1772031}},
 	{"zhyko", {5891}},
 	{"ZombieMooose", {11994}},
 	{"mobieh22", {10010}},
@@ -157,7 +157,7 @@ local playsession = {
 	{"CreeperMillion5", {8053}},
 	{"Redrar", {4297}},
 	{"godfoder", {821}},
-	{"AwkwardNoah", {124286}},
+	{"AwkwardNoah", {199742}},
 	{"lucj25", {28686}},
 	{"dragon12129", {4528}},
 	{"Alordex", {75781}},
@@ -167,7 +167,7 @@ local playsession = {
 	{"TmgNukem", {32524}},
 	{"PlumpCat", {29186}},
 	{"kmarcusm", {146131}},
-	{"dpoba", {677901}},
+	{"dpoba", {857902}},
 	{"LycostA", {11503}},
 	{"lazerandy", {109856}},
 	{"Furancebob", {371010}},
@@ -185,6 +185,10 @@ local playsession = {
 	{"Goofables", {3087}},
 	{"chromaddict", {64987}},
 	{"wolfe08", {5292}},
-	{"Achskelmos", {56047}}
+	{"Achskelmos", {743106}},
+	{"SmotPokin42000", {533564}},
+	{"mix89nur", {5455}},
+	{"fishpig117", {112961}},
+	{"Yumiyumi2", {1341}}
 }
 return playsession
\ No newline at end of file
diff --git a/session_data/WnujFSWDBwXtzJPX.lua b/session_data/WnujFSWDBwXtzJPX.lua
deleted file mode 100644
index c7e94fcd..00000000
--- a/session_data/WnujFSWDBwXtzJPX.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local playtimes = {
-	{"mewmew", {2561}}
-}
-return playtimes
\ No newline at end of file
diff --git a/session_data/eovuYGvdICGhruuU.lua b/session_data/eovuYGvdICGhruuU.lua
new file mode 100644
index 00000000..a9496b72
--- /dev/null
+++ b/session_data/eovuYGvdICGhruuU.lua
@@ -0,0 +1,8 @@
+local playsession = {
+	{"mewmew", {25477}},
+	{"caolulingwh", {2626}},
+	{"grilledham", {8197}},
+	{"ANV1L", {2498}},
+	{"Drezik99", {16001}}
+}
+return playsession
\ No newline at end of file
diff --git a/session_data/mqQcIlDBSSuYlsqS.lua b/session_data/mqQcIlDBSSuYlsqS.lua
deleted file mode 100644
index f9cb3a5f..00000000
--- a/session_data/mqQcIlDBSSuYlsqS.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local playtimes = {
-	{"mewmew", {691}}
-}
-return playtimes
\ No newline at end of file
diff --git a/session_data/qXANKmjuRGjFRkUW.lua b/session_data/qXANKmjuRGjFRkUW.lua
deleted file mode 100644
index f75e94bb..00000000
--- a/session_data/qXANKmjuRGjFRkUW.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local playtimes = {
-	{"mewmew", {3073}}
-}
-return playtimes
\ No newline at end of file
diff --git a/session_data/xdVfyDCCkjGTPkso.lua b/session_data/xdVfyDCCkjGTPkso.lua
deleted file mode 100644
index 60de1ead..00000000
--- a/session_data/xdVfyDCCkjGTPkso.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-local playtimes = {
-	{"mewmew", {55314}}
-}
-return playtimes
\ No newline at end of file