diff --git a/GameEngine/Building.php b/GameEngine/Building.php
index 597bcee1..98242098 100644
--- a/GameEngine/Building.php
+++ b/GameEngine/Building.php
@@ -72,24 +72,22 @@ class Building {
                 $this->upgradeBuilding($get['a']);
             }
         }
-        if(isset($get['master']) && isset($get['id']) && isset($get['time']) && $session->gold >= 1 && $session->goldclub && $village->master == 0 && (isset($get['c']) && $get['c']== $session->checker) && isset($_SESSION['mas'])) {
+        if(isset($get['master']) && isset($get['id']) && isset($get['time']) && $session->gold >= 1 && $session->goldclub && $village->master == 0 && (isset($get['c']) && $get['c']== $session->checker)) {
             $m=$get['master'];
-            $master=explode(",",$_SESSION['mas'][$m]);
-            if($get['master']==$master[0] && $get['id']==$master[1] && $get['time']==$master[2]) {
-                $session->changeChecker();
-                unset($_SESSION['mas']);
-                if($session->access==BANNED){
-                    header("Location: banned.php");
-                    exit;
-                }    
-                $level = $database->getResourceLevel($village->wid);
-                $database->addBuilding($village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level['f'.$get['id']] + 1 + count($database->getBuildingByField($village->wid,$get['id'])));
-                if($get['id'] > 18) {
-                    header("Location: dorf2.php");
-                } else {
-                    header("Location: dorf1.php");
-                }
+            $master = $_GET;
+            $session->changeChecker();
+            if($session->access==BANNED){
+                header("Location: banned.php");
+                exit;
             }    
+            $level = $database->getResourceLevel($village->wid);
+            $database->addBuilding($village->wid, $get['id'], $get['master'], 1, $get['time'], 1, $level['f'.$get['id']] + 1 + count($database->getBuildingByField($village->wid,$get['id'])));
+            $database->modifyGold($session->uid,1,0);
+            if($get['id'] > 18) {
+                header("Location: dorf2.php");
+            } else {
+                header("Location: dorf1.php");
+            }
         }
         if(isset($get['a']) && $get['c'] == $session->checker && isset($get['id'])) {
             if  ($get['id'] > 18 && ($get['id'] < 41 || $get['id'] == 99)){
diff --git a/Templates/Build/avaliable/availupgrade.tpl b/Templates/Build/avaliable/availupgrade.tpl
index 2f0f6907..c9797723 100644
--- a/Templates/Build/avaliable/availupgrade.tpl
+++ b/Templates/Build/avaliable/availupgrade.tpl
@@ -23,7 +23,7 @@ $mastertime = $uprequire['time'];
 ?>	</br>
 <?php
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">Constructing with master builder </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">Constructing with master builder </a>";
 		echo '<font color="#B3B3B3">(costs: <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="Gold"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">Constructing with master builder</span>";
@@ -37,7 +37,7 @@ $mastertime = $uprequire['time'];
 ?>	</br>
 <?php
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">Constructing with master builder </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">Constructing with master builder </a>";
 		echo '<font color="#B3B3B3">(costs: <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="Gold"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">Constructing with master builder</span>";
@@ -61,7 +61,7 @@ $mastertime = $uprequire['time'];
 ?>	</br>
 <?php
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">Constructing with master builder </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">Constructing with master builder </a>";
 		echo '<font color="#B3B3B3">(costs: <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="Gold"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">Constructing with master builder</span>";
@@ -84,4 +84,4 @@ $mastertime = $uprequire['time'];
 	 }
      }
             ?>	
-</td>
\ No newline at end of file
+</td>
diff --git a/Templates/Build/upgrade.tpl b/Templates/Build/upgrade.tpl
index 81b3d8cb..820ccd90 100644
--- a/Templates/Build/upgrade.tpl
+++ b/Templates/Build/upgrade.tpl
@@ -27,7 +27,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 <?php
 	if($id <= 18) {
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";
@@ -35,7 +35,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 	}
 	}else{
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";
@@ -51,7 +51,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 <?php
 	if($id <= 18) {
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";
@@ -59,7 +59,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 	}
 	}else{
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";
@@ -89,7 +89,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 <?php
 	if($id <= 18) {
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf1.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";
@@ -97,7 +97,7 @@ if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1) {
 	}
 	}else{
 	if($session->gold >= 1 && $village->master == 0){
-	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime\">".CONSTRUCTING_MASTER_BUILDER." </a>";
+	    echo "<a class=\"build\" href=\"dorf2.php?master=$bid&id=$id&time=$mastertime&c=$session->checker\">".CONSTRUCTING_MASTER_BUILDER." </a>";
 		echo '<font color="#B3B3B3">('.COSTS.': <img src="'.GP_LOCATE.'img/a/gold_g.gif" alt="Gold" title="'.GOLD.'"/>1)</font>';
 	}else{
 		echo "<span class=\"none\">".CONSTRUCTING_MASTER_BUILDER."</span>";