diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c4c4ffc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.zip
diff --git a/changelog.txt b/changelog.txt
index 2c20c69..f663fe1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,12 +1,14 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.18.1
-Date: 22. 2. 2020
+Date: 2020-03-19
   Changes:
     - Added changelog file
     - Changed dependency to base 0.18
+  Bugfixes:
+    - Redesigned surface handling to ensure compatibility with other planets and Blueprint Lab
 ---------------------------------------------------------------------------------------------------
 Version: 0.18.0
-Date: 20. 2. 2020
+Date: 2020-02-20
   Changes:
     - Ported to 0.18
     - Renamed mod for upload in mod portal
diff --git a/control.lua b/control.lua
index 99f7780..be1a7c0 100644
--- a/control.lua
+++ b/control.lua
@@ -1,24 +1,16 @@
 --control.lua
 --This mod scans the map for gun-turrets and places alerts when turrets are low. 
 
-
 script.on_event({defines.events.on_tick}, function (event)
-	--Every minute the surface is rescanned for ammo-turret type entities. This is stored in the global table. 
-	if event.tick%3600 == 0 or global.turret_entities == nil then
-		local planet = game.surfaces
-		for index,value in pairs(planet) do
-			global.turret_entities = planet[index].find_entities_filtered{type = "ammo-turret"}
-		end
-	end
-	
-    if event.tick%600 == 0 then
+	if event.tick%600 == 0 then
 	--Every 10 seconds recheck and give alerts to players for ammo-turret entities on the same force as them. 
 		for index,player in pairs(game.connected_players) do
 			
 			GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
 			player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
+			turret_entities = player.surface.find_entities_filtered{type = "ammo-turret"}
 			if GTA_enabled then
-				for index2, turret_entity in pairs(global.turret_entities) do
+				for index2, turret_entity in pairs(turret_entities) do
 					if turret_entity.valid then
 						inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
 						if inv_var.is_empty() then
@@ -37,8 +29,5 @@ script.on_event({defines.events.on_tick}, function (event)
 				end
 			end
 		end
-	end 
-end)
-
-
-
+	end
+end)
\ No newline at end of file
diff --git a/info.json b/info.json
index 65b7160..40f5055 100644
--- a/info.json
+++ b/info.json
@@ -1,6 +1,6 @@
 {
     "name": "Gun_Turret_Alerts",
-    "version": "0.18.0",
+    "version": "0.18.1",
     "title": "Gun_Turret_Alerts",
     "author": "Wyrrrd",
     "factorio_version": "0.18",