diff --git a/GameEngine/Admin/Mods/natarbuildingplan.php b/GameEngine/Admin/Mods/natarbuildingplan.php
index 1928f904..f37b0726 100755
--- a/GameEngine/Admin/Mods/natarbuildingplan.php
+++ b/GameEngine/Admin/Mods/natarbuildingplan.php
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
 
 $id = (int) $_POST['id'];
 $amt = (int) $_POST['vill_amount'];
-$addUnitsWrefs = [];
 
     for($i=1;$i<=$amt;$i++) {
 
@@ -41,7 +40,7 @@ $addUnitsWrefs = [];
         mysqli_query($GLOBALS["link"], $q);
         $pop = $automation->recountPop($wid);
         $cp = $automation->recountPop($wid);
-        $addUnitsWrefs[] = $wid;
+        $database->addUnits($wid);
         $database->addTech($wid);
         $database->addABTech($wid);
         $speed = NATARS_UNITS;
@@ -51,8 +50,6 @@ $addUnitsWrefs = [];
         $database->addArtefact($wid, 3, 11, 1, PLAN, $desc, '', 'type1.gif');
     }
 
-    $database->addUnits($addUnitsWrefs);
-
     $myFile = "../../../Templates/text.tpl";
     $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: templates/text.tpl");
     $text = file_get_contents("../../../Templates/text_format.tpl");
diff --git a/GameEngine/Admin/Mods/natarend.php b/GameEngine/Admin/Mods/natarend.php
index 68497aa4..a3fd058f 100755
--- a/GameEngine/Admin/Mods/natarend.php
+++ b/GameEngine/Admin/Mods/natarend.php
@@ -27,7 +27,6 @@ include_once($autoprefix."GameEngine/Database.php");
 
 $id = (int) $_POST['id'];
 $amt = (int) $_POST['vill_amount'];
-$addUnitsWrefs = [];
 $addTechWrefs = [];
 $addABTechWrefs = [];
 
@@ -44,17 +43,16 @@ for($i=1;$i<=$amt;$i++) {
 		mysqli_query($GLOBALS["link"], $q);
 		$pop = $automation->recountPop($wid);
 		$cp = $automation->recountPop($wid);
-		$addUnitsWrefs[] = $wid;
 		$addTechWrefs[] = $wid;
 		$addABTechWrefs[] = $wid;
 		$speed = NATARS_UNITS;
 
 		//new with random amount of troops
+        $database->addUnits($wid);
         $q = "UPDATE " . TB_PREFIX . "units SET u41 = " . (rand(50, 1200) * $speed) . ", u42 = " . (rand(100, 1400) * $speed) . ", u43 = " . (rand(200, 1600) * $speed) . ", u44 = " . (rand(10, 50) * $speed) . ", u45 = " . (rand(48, 1700) * $speed) . ", u46 = " . (rand(60, 1800) * $speed) . ", u47 = " . (rand(200, 1600) * $speed) . ", u48 = " . (rand(40, 200) * $speed) . " , u49 = " . (rand(4, 20) * $speed) . ", u50 = " . (rand(5, 25) * $speed) . " WHERE vref = '".$wid."'";
 		mysqli_query($GLOBALS["link"], $q);
 }
 
-$database->addUnits($addUnitsWrefs);
 $database->addTech($addTechWrefs);
 $database->addABTech($addABTechWrefs);
 
diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php
index 97f9086a..fcc2878e 100755
--- a/GameEngine/Automation.php
+++ b/GameEngine/Automation.php
@@ -1206,7 +1206,7 @@ class Automation {
         }
 
         $reload=false;
-        $ourFileHandle = fopen("GameEngine/Prevention/sendunits.txt", 'w');
+        $ourFileHandle = fopen($autoprefix."GameEngine/Prevention/sendunits.txt", 'w');
         fclose($ourFileHandle);
         $time = time();
         $q = "
@@ -3138,8 +3138,8 @@ class Automation {
             }
         }
 
-        if(file_exists("GameEngine/Prevention/sendunits.txt")) {
-            unlink("GameEngine/Prevention/sendunits.txt");
+        if(file_exists($autoprefix."GameEngine/Prevention/sendunits.txt")) {
+            unlink($autoprefix."GameEngine/Prevention/sendunits.txt");
         }
         if ($reload) header("Location: ".$_SERVER['PHP_SELF']);
     }
diff --git a/GameEngine/Building.php b/GameEngine/Building.php
index da5ac596..17e81ff6 100755
--- a/GameEngine/Building.php
+++ b/GameEngine/Building.php
@@ -87,19 +87,22 @@ class Building {
 
             // check if we should allow building the WW this high
             if ( $wwHighestLevelFound >= 50 ) {
-                $needed_plan = 1;
+                $needed_plan = 2;
             } else {
-                $needed_plan = 0;
+                $needed_plan = 1;
             }
 
             // count building plans
             if ( $needed_plan ) {
                 $wwbuildingplan = 0;
+                $planFoundInOwnersVillage = false;
                 $villages       = $database->getVillagesID( $session->uid );
+
                 foreach ( $villages as $village1 ) {
                     $plan = count( $database->getOwnArtefactInfoByType2( $village1, 11 ) );
                     if ( $plan > 0 ) {
                         $wwbuildingplan = 1;
+                        $planFoundInOwnersVillage = true;
                     }
                 }
 
@@ -118,7 +121,11 @@ class Building {
                     }
                 }
 
-                $cached = $wwbuildingplan > $needed_plan;
+                if ($needed_plan == 1) {
+                    $cached = ($wwbuildingplan >= $needed_plan && $planFoundInOwnersVillage);
+                } else {
+                    $cached = $wwbuildingplan >= $needed_plan;
+                }
             } else {
                 // no need for building plans, we can still upgrade WW
                 $cached = true;