diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index a893752a..5088958a 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -570,7 +570,7 @@ class Technology {
         return $upkeep;
 	}
 
-private function trainUnit($unit,$amt,$great=false) {
+    private function trainUnit($unit,$amt,$great=false) {
 		global $session,$database,${'u'.$unit},$building,$village,$bid19,$bid20,$bid21,$bid25,$bid26,$bid29,$bid30,$bid36,$bid41,$bid42;
 
 		if($this->getTech($unit) || $unit%10 <= 1 || $unit == 99) {
@@ -650,88 +650,68 @@ private function trainUnit($unit,$amt,$great=false) {
 	public function meetRRequirement($tech) {
 		global $session,$building;
 		switch($tech) {
-			case 2:
-			if($building->getTypeLevel(22) >= 1 && $building->getTypeLevel(13) >= 1) { return true; } else { return false; }
-			break;
-			case 3:
-			if($building->getTypeLevel(22) >= 5 && $building->getTypeLevel(12) >= 1) { return true; } else { return false; }
-			break;
+			case 2: return $building->getTypeLevel(22) >= 1 && $building->getTypeLevel(13) >= 1;
+			case 3: return $building->getTypeLevel(22) >= 5 && $building->getTypeLevel(12) >= 1;
+			
 			case 4:
-			case 23:
-			if($building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 1) { return true; } else { return false; }
-			break;
+			case 23: return$building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 1;
+
 			case 5:
-			case 25:
-			if($building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 5) { return true; } else { return false; }
-			break;
-			case 6:
-			if($building->getTypeLevel(22) >= 15 && $building->getTypeLevel(20) >= 10) { return true; } else { return false; }
-			break;
+			case 25: return $building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 5;
+			
+			case 6: return $building->getTypeLevel(22) >= 15 && $building->getTypeLevel(20) >= 10;
+			
 			case 9:
-			case 29:
-			if($building->getTypeLevel(22) >= 20 && $building->getTypeLevel(16) >= 10) { return true; } else { return false; }
-			break;
+			case 29: return $building->getTypeLevel(22) >= 20 && $building->getTypeLevel(16) >= 10;
+
 			case 12:
 			case 32:
-			case 42:
-			if($building->getTypeLevel(22) >= 1 && $building->getTypeLevel(19) >= 3) { return true; } else { return false; }
-			break;
+			case 42: return $building->getTypeLevel(22) >= 1 && $building->getTypeLevel(19) >= 3;
+
 			case 13:
 			case 33:
-			case 43:
-			if($building->getTypeLevel(22) >= 3 && $building->getTypeLevel(12) >= 1) { return true; } else { return false; }
-			break;
+			case 43: return $building->getTypeLevel(22) >= 3 && $building->getTypeLevel(12) >= 1;
+
 			case 14:
 			case 34:
-			case 44:
-			if($building->getTypeLevel(22) >= 1 && $building->getTypeLevel(15) >= 5) { return true; } else { return false; }
-			break;
+			case 44: return $building->getTypeLevel(22) >= 1 && $building->getTypeLevel(15) >= 5;
+
 			case 15:
 			case 35:
-			case 45:
-			if($building->getTypeLevel(22) >= 1 && $building->getTypeLevel(20) >= 3) { return true; } else { return false; }
-			break;
+			case 45: return $building->getTypeLevel(22) >= 1 && $building->getTypeLevel(20) >= 3;
+
 			case 16:
 			case 26:
 			case 36:
-			case 46:
-			if($building->getTypeLevel(22) >= 15 && $building->getTypeLevel(20) >= 10) { return true; } else { return false; }
-			break;
+			case 46: return $building->getTypeLevel(22) >= 15 && $building->getTypeLevel(20) >= 10;
+			
 			case 7:
 			case 17:
 			case 27:
 			case 37:
-			case 47:
-			if($building->getTypeLevel(22) >= 10 && $building->getTypeLevel(21) >= 1) { return true; } else { return false; }
-			break;
+			case 47: return $building->getTypeLevel(22) >= 10 && $building->getTypeLevel(21) >= 1;
+			
 			case 8:
 			case 18:
 			case 28:
 			case 38:
-			case 48:
-			if($building->getTypeLevel(22) >= 15 && $building->getTypeLevel(21) >= 10) { return true; } else { return false; }
-			break;
+			case 48: return $building->getTypeLevel(22) >= 15 && $building->getTypeLevel(21) >= 10;
+			
 			case 19:
 			case 39:
-			case 49:
-			if($building->getTypeLevel(22) >= 20 && $building->getTypeLevel(16) >= 5) { return true; } else { return false; }
-			break;
-			case 22:
-			if($building->getTypeLevel(22) >= 3 && $building->getTypeLevel(12) >= 1) { return true; } else { return false; }
-			break;
-			case 24:
-			if($building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 3) { return true; } else { return false; }
-			break;
+			case 49: return $building->getTypeLevel(22) >= 20 && $building->getTypeLevel(16) >= 5;
+			
+			case 22: return $building->getTypeLevel(22) >= 3 && $building->getTypeLevel(12) >= 1;
+			
+			case 24: return $building->getTypeLevel(22) >= 5 && $building->getTypeLevel(20) >= 3;
 		}
 	}
 
 	private function researchTech($get) {
-		//global $database,$session,${'r'.$get['a']},$village,$logging;
 		global $database,$session,${'r'.$get['a']},$bid22,$building,$village,$logging;
 		if($this->meetRRequirement($get['a']) && $get['c'] == $session->mchecker) {
 			$data = ${'r'.$get['a']};
 			$time = time() + round(($data['time'] * ($bid22[$building->getTypeLevel(22)]['attri'] / 100))/SPEED);
-			//$time = time() + round($data['time']/SPEED);
 			$database->modifyResource($village->wid,$data['wood'],$data['clay'],$data['iron'],$data['crop'],0);
 			$database->addResearch($village->wid,"t".$get['a'],$time);
 			$logging->addTechLog($village->wid,"t".$get['a'],1);
@@ -741,15 +721,27 @@ private function trainUnit($unit,$amt,$great=false) {
 		exit;
 	}
 
+	//TODO: Merge these two functions in one function, they're very similar to each other
+	
 	private function upgradeSword($get) {
 		global $database,$session,$bid12,$building,$village,$logging;
 		$ABTech = $database->getABTech($village->wid);
-		$CurrentTech = $ABTech["b".$get['a']];
+		$ABUpgrades = $this->getABUpgrades('b');
+		$ABUpgradesCount = count($ABUpgrades);
+		
+		$ups = 0;
+		if(count($ABUpgradesCount) > 0){
+		    foreach($ABUpgrades as $upgrade){
+		        if(in_array(("b".$get['a']), $upgrade)) $ups++;
+		    }
+		}
+		
+		$CurrentTech = $ABTech["b".$get['a']]+$ups;
 		$unit = ($session->tribe-1)*10+intval($get['a']);
-		if(($this->getTech($unit) || ($unit % 10) == 1) && ($CurrentTech < $building->getTypeLevel(12)) && $get['c'] == $session->mchecker) {
+		if(($ABUpgradesCount < 2 && $session->plus || $ABUpgradesCount == 0) && ($this->getTech($unit) || ($unit % 10) == 1) && ($CurrentTech < $building->getTypeLevel(12)) && $get['c'] == $session->mchecker) {
 			global ${'ab'.strval($unit)};
 			$data = ${'ab'.strval($unit)};
-			$time = time() + round(($data[$CurrentTech+1]['time'] * ($bid12[$building->getTypeLevel(12)]['attri'] / 100))/SPEED);
+			$time = time() + round(($data[$CurrentTech+1]['time'] * ($bid12[$building->getTypeLevel(12)]['attri'] / 100))/SPEED) + ($ABUpgradesCount > 0 ? ($ABUpgrades[$ABUpgradesCount-1]['timestamp'] - time()) + 60 : 0);
 			if ($database->modifyResource($village->wid,$data[$CurrentTech+1]['wood'],$data[$CurrentTech+1]['clay'],$data[$CurrentTech+1]['iron'],$data[$CurrentTech+1]['crop'],0)) {
 				$database->addResearch($village->wid,"b".$get['a'],$time);
 				$logging->addTechLog($village->wid,"b".$get['a'],$CurrentTech+1);
@@ -763,12 +755,22 @@ private function trainUnit($unit,$amt,$great=false) {
 	private function upgradeArmour($get) {
 		global $database,$session,$bid13,$building,$village,$logging;
 		$ABTech = $database->getABTech($village->wid);
-		$CurrentTech = $ABTech["a".$get['a']];
+		$ABUpgrades = $this->getABUpgrades('a');
+		$ABUpgradesCount = count($ABUpgrades);
+		
+		$ups = 0;
+		if(count($ABUpgradesCount) > 0){
+		    foreach($ABUpgrades as $upgrade){
+		        if(in_array(("a".$get['a']), $upgrade)) $ups++;
+		    }
+		}
+		
+		$CurrentTech = $ABTech["a".$get['a']]+$ups;
 		$unit = ($session->tribe-1)*10+intval($get['a']);
-		if(($this->getTech($unit) || ($unit % 10) == 1) && ($CurrentTech < $building->getTypeLevel(13)) && $get['c'] == $session->mchecker) {
+		if(($ABUpgradesCount < 2 && $session->plus || $ABUpgradesCount == 0) && ($this->getTech($unit) || ($unit % 10) == 1) && ($CurrentTech < $building->getTypeLevel(13)) && $get['c'] == $session->mchecker) {
 			global ${'ab'.strval($unit)};
 			$data = ${'ab'.strval($unit)};
-			$time = time() + round(($data[$CurrentTech+1]['time'] * ($bid13[$building->getTypeLevel(13)]['attri'] / 100))/SPEED);
+			$time = time() + round(($data[$CurrentTech+1]['time'] * ($bid13[$building->getTypeLevel(13)]['attri'] / 100))/SPEED) + ($ABUpgradesCount > 0 ? ($ABUpgrades[$ABUpgradesCount-1]['timestamp'] - time()) + 60 : 0);
 			if ($database->modifyResource($village->wid,$data[$CurrentTech+1]['wood'],$data[$CurrentTech+1]['clay'],$data[$CurrentTech+1]['iron'],$data[$CurrentTech+1]['crop'],0)) {
 				$database->addResearch($village->wid,"a".$get['a'],$time);
 				$logging->addTechLog($village->wid,"a".$get['a'],$CurrentTech+1);
diff --git a/Templates/Build/12_upgrades.tpl b/Templates/Build/12_upgrades.tpl
index 3ff26ef2..4b66292f 100644
--- a/Templates/Build/12_upgrades.tpl
+++ b/Templates/Build/12_upgrades.tpl
@@ -10,51 +10,65 @@
 		<?php
 		$abdata = $database->getABTech($village->wid);
 		$ABups = $technology->getABUpgrades('b');
+		$totalUps = count($ABups);
 		for($i=($session->tribe*10-9);$i<=($session->tribe*10-2);$i++) {
 			$j = $i % 10 ;
 			if ( $technology->getTech($i) || $j == 1 ) {
+			    
 				echo "<tr><td class=\"desc\"><div class=\"tit\">
 <img class=\"unit u".$i."\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" />
-<a href=\"#\" onClick=\"return Popup(".$i.",1);\">".$technology->getUnitName($i)."</a> (Level ".$abdata['b'.$j].")
-</div>";
-				if($abdata['b'.$j] != 20) {
-echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"Lumber\" />".${'ab'.$i}[$abdata['b'.$j]+1]['wood']."|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"Clay\" />".${'ab'.$i}[$abdata['b'.$j]+1]['clay']."|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"Iron\" />".${'ab'.$i}[$abdata['b'.$j]+1]['iron']."|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"Crop\" />".${'ab'.$i}[$abdata['b'.$j]+1]['crop']."|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"duration\" />";
-				echo $generator->getTimeFormat(round(${'ab'.$i}[$abdata['b'.$j]+1]['time']*($bid12[$building->getTypeLevel(12)]['attri'] / 100)/SPEED));
+<a href=\"#\" onClick=\"return Popup(".$i.",1);\">".$technology->getUnitName($i)."</a> (Level ".$abdata['b'.$j];
+				$ups = 0;
+				if($totalUps > 0){
+				    foreach($ABups as $upgrade){
+				        if(in_array(("b".$j), $upgrade)) $ups++;
+				    }
+				    if($ups > 0) echo "+".$ups;
+				}
+				echo ")</div>";
+				
+				if($abdata['b'.$j]+$ups != 20) {
+				    echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"Lumber\" />".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood']."|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"Clay\" />".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay']."|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"Iron\" />".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron']."|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"Crop\" />".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop']."|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"duration\" />";
+				    echo $generator->getTimeFormat(round(${'ab'.$i}[$abdata['b'.$j]+1+$ups]['time']*($bid12[$building->getTypeLevel(12)]['attri'] / 100)/SPEED));
 				
                     //-- If available resources combined are not enough, remove NPC button
-                    $total_required = (int)(${'ab'.$i}[$abdata['b'.$j]+1]['wood'] + ${'ab'.$i}[$abdata['b'.$j]+1]['clay'] + ${'ab'.$i}[$abdata['b'.$j]+1]['iron'] + ${'ab'.$i}[$abdata['b'.$j]+1]['crop']);
+				    $total_required = (int)(${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood'] + ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay'] + ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron'] + ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop']);
                     if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1 && $village->atotal >= $total_required) {
-					echo "|<a href=\"build.php?gid=17&t=3&r1=".${'ab'.$i}[$abdata['b'.$j]+1]['wood']."&r2=".${'ab'.$i}[$abdata['b'.$j]+1]['clay']."&r3=".${'ab'.$i}[$abdata['b'.$j]+1]['iron']."&r4=".${'ab'.$i}[$abdata['b'.$j]+1]['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
+                        echo "|<a href=\"build.php?gid=17&t=3&r1=".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood']."&r2=".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay']."&r3=".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron']."&r4=".${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
 					}
 				}
 		        if($abdata['b'.$j] == 20) {
 					echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>";
 				}
-				else if(${'ab'.$i}[$abdata['b'.$j]+1]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1]['iron'] > $village->maxstore) {
+				else if(${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron'] > $village->maxstore) {
 					echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>";
 				}
-				else if (${'ab'.$i}[$abdata['b'.$j]+1]['crop'] > $village->maxcrop) {
+				else if (${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop'] > $village->maxcrop) {
 					echo "<td class=\"act\"><div class=\"none\">".EXPAND_GRANARY."</div></td></tr>";
 				}
-				else if (${'ab'.$i}[$abdata['b'.$j]+1]['wood'] > $village->awood || ${'ab'.$i}[$abdata['b'.$j]+1]['clay'] > $village->aclay || ${'ab'.$i}[$abdata['b'.$j]+1]['iron'] > $village->airon || ${'ab'.$i}[$abdata['b'.$j]+1]['crop'] > $village->acrop) {
-					if($village->getProd("crop")>0 || $village->acrop > ${'ab'.$i}[$abdata['b'.$j]+1]['crop']){
-						$time = $technology->calculateAvaliable(12,${'ab'.$i}[$abdata['b'.$j]+1]);
+				else if (${'ab'.$i}[$abdata['b'.$j]+1+$ups]['wood'] > $village->awood || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['clay'] > $village->aclay || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['iron'] > $village->airon || ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop'] > $village->acrop) {
+				    if($village->getProd("crop")>0 || $village->acrop > ${'ab'.$i}[$abdata['b'.$j]+1+$ups]['crop']){
+				        $time = $technology->calculateAvaliable(12,${'ab'.$i}[$abdata['b'.$j]+1+$ups]);
 			            echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$time[0]." at ".$time[1]."</span></div></td>";
 					} else {
 						echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
 					}
 		            echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>";
 				}
-				else if ($building->getTypeLevel(12) <= $abdata['b'.$j]) {
+				else if ($building->getTypeLevel(12) <= $abdata['b'.$j]+$ups) {
 					echo "<td class=\"act\"><div class=\"none\">".UPGRADE_BLACKSMITH."</div></td></tr>";
 				}
-				else if (count($ABups) > 0) {
+				else if ($totalUps == 1 && !$session->plus || $totalUps > 1) {
 					echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>";
 				}
 				else if($session->access != BANNED){
-					echo "<td class=\"act\"><a class=\"research\" href=\"build.php?id=$id&amp;a=$j&amp;c=".$session->mchecker."\">".UPGRADE."</a></td></tr>";
+				    echo "<td class=\"act\"><a class=\"research\" href=\"build.php?id=$id&amp;a=$j&amp;c=".$session->mchecker."\">".UPGRADE."</a>";
+				    if($totalUps != 0) echo "<span class=\"none\"> ".WAITING."</span>";
+				    echo"</td></tr>";
 				}else{
-					echo "<td class=\"act\"><a class=\"research\" href=\"banned.php\">".UPGRADE."</a></td></tr>";
+				    echo "<td class=\"act\"><a class=\"research\" href=\"banned.php\">".UPGRADE."</a>";
+				    if($totalUps != 0) echo "<span class=\"none\"> ".WAITING."</span>";
+				    echo"</td></tr>";
 				}
 			}
 		}
@@ -63,13 +77,15 @@ echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\"
 </table>
 
 <?php
-	if(count($ABups) > 0) {
+    if($totalUps > 0) {
 		echo "<table cellpadding=\"1\" cellspacing=\"1\" class=\"under_progress\"><thead><tr><td>".UPGRADING."</td><td>".DURATION."</td><td>".COMPLETE."</td></tr>
 </thead><tbody>";
 		$timer = 1;
 		foreach($ABups as $black) {
 			$unit = ($session->tribe-1)*10 + substr($black['tech'],1,2);
-			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit)."</td>";
+			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
+			if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
+			echo "</td>";
 			echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($black['timestamp']-time())."</span></td>";
 			$date = $generator->procMtime($black['timestamp']);
 			echo "<td class=\"fin\"><span>".$date[1]."</span><span> hrs</span></td>";
diff --git a/Templates/Build/13_upgrades.tpl b/Templates/Build/13_upgrades.tpl
index 3bc9ddbc..9b92aeb7 100644
--- a/Templates/Build/13_upgrades.tpl
+++ b/Templates/Build/13_upgrades.tpl
@@ -10,51 +10,65 @@
 		<?php
 		$abdata = $database->getABTech($village->wid);
 		$ABups = $technology->getABUpgrades('a');
+		$totalUps = count($ABups);
 		for($i=($session->tribe*10-9);$i<=($session->tribe*10-2);$i++) {
 			$j = $i % 10 ;
 			if ( $technology->getTech($i) || $j == 1 ) {
+			    
 				echo "<tr><td class=\"desc\"><div class=\"tit\">
 <img class=\"unit u".$i."\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($i)."\" title=\"".$technology->getUnitName($i)."\" />
-<a href=\"#\" onClick=\"return Popup(".$i.",1);\">".$technology->getUnitName($i)."</a> (Level ".$abdata['a'.$j].")
-</div>";
-				if($abdata['a'.$j] != 20) {
-echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"Lumber\" />".${'ab'.$i}[$abdata['a'.$j]+1]['wood']."|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"Clay\" />".${'ab'.$i}[$abdata['a'.$j]+1]['clay']."|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"Iron\" />".${'ab'.$i}[$abdata['a'.$j]+1]['iron']."|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"Crop\" />".${'ab'.$i}[$abdata['a'.$j]+1]['crop']."|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"duration\" />";
-				echo $generator->getTimeFormat(round(${'ab'.$i}[$abdata['a'.$j]+1]['time']*($bid13[$building->getTypeLevel(13)]['attri'] / 100)/SPEED));
+<a href=\"#\" onClick=\"return Popup(".$i.",1);\">".$technology->getUnitName($i)."</a> (Level ".$abdata['a'.$j];
+				$ups = 0;
+				if($totalUps > 0){
+				    foreach($ABups as $upgrade){
+				        if(in_array(("a".$j), $upgrade)) $ups++;
+				    }
+				    if($ups > 0) echo "+".$ups;	
+				}
+				echo ")</div>";
+				
+				if($abdata['a'.$j]+$ups != 20) {
+				    echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\" title=\"Lumber\" />".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood']."|<img class=\"r2\" src=\"img/x.gif\" alt=\"Clay\" title=\"Clay\" />".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay']."|<img class=\"r3\" src=\"img/x.gif\" alt=\"Iron\" title=\"Iron\" />".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron']."|<img class=\"r4\" src=\"img/x.gif\" alt=\"Crop\" title=\"Crop\" />".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop']."|<img class=\"clock\" src=\"img/x.gif\" alt=\"duration\" title=\"duration\" />";
+				    echo $generator->getTimeFormat(round(${'ab'.$i}[$abdata['a'.$j]+1+$ups]['time']*($bid13[$building->getTypeLevel(13)]['attri'] / 100)/SPEED));
 				
                     //-- If available resources combined are not enough, remove NPC button
-                    $total_required = (int)(${'ab'.$i}['wood'] + ${'ab'.$i}['clay'] + ${'ab'.$i}['iron'] + ${'ab'.$i}['crop']);
+				    $total_required = (int)(${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood'] + ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay'] + ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron'] + ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop']);
                     if($session->userinfo['gold'] >= 3 && $building->getTypeLevel(17) >= 1 && $village->atotal >= $total_required) {
-					echo "|<a href=\"build.php?gid=17&t=3&r1=".${'ab'.$i}[$abdata['a'.$j]+1]['wood']."&r2=".${'ab'.$i}[$abdata['a'.$j]+1]['clay']."&r3=".${'ab'.$i}[$abdata['a'.$j]+1]['iron']."&r4=".${'ab'.$i}[$abdata['a'.$j]+1]['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
+                        echo "|<a href=\"build.php?gid=17&t=3&r1=".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood']."&r2=".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay']."&r3=".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron']."&r4=".${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop']."\" title=\"NPC trade\"><img class=\"npc\" src=\"img/x.gif\" alt=\"NPC trade\" title=\"NPC trade\" /></a>";
 					}
 				}
 		        if($abdata['a'.$j] == 20) {
 					echo "<td class=\"act\"><div class=\"none\">".MAXIMUM_LEVEL."</div></td></tr>";
 				}
-				else if(${'ab'.$i}[$abdata['a'.$j]+1]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1]['iron'] > $village->maxstore) {
+				else if(${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay'] > $village->maxstore || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron'] > $village->maxstore) {
 					echo "<td class=\"act\"><div class=\"none\">".EXPAND_WAREHOUSE."</div></td></tr>";
 				}
-				else if (${'ab'.$i}[$abdata['a'.$j]+1]['crop'] > $village->maxcrop) {
+				else if (${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop'] > $village->maxcrop) {
 					echo "<td class=\"act\"><div class=\"none\">".EXPAND_GRANARY."</div></td></tr>";
 				}
-				else if (${'ab'.$i}[$abdata['a'.$j]+1]['wood'] > $village->awood || ${'ab'.$i}[$abdata['a'.$j]+1]['clay'] > $village->aclay || ${'ab'.$i}[$abdata['a'.$j]+1]['iron'] > $village->airon || ${'ab'.$i}[$abdata['a'.$j]+1]['crop'] > $village->acrop) {
-					if($village->getProd("crop")>0 || $village->acrop > ${'ab'.$i}[$abdata['a'.$j]+1]['crop']){
-						$time = $technology->calculateAvaliable(13,${'ab'.$i}[$abdata['a'.$j]+1]);
+				else if (${'ab'.$i}[$abdata['a'.$j]+1+$ups]['wood'] > $village->awood || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['clay'] > $village->aclay || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['iron'] > $village->airon || ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop'] > $village->acrop) {
+				    if($village->getProd("crop")>0 || $village->acrop > ${'ab'.$i}[$abdata['a'.$j]+1+$ups]['crop']){
+					    $time = $technology->calculateAvaliable(13,${'ab'.$i}[$abdata['a'.$j]+1+$ups]);
 						echo "<br><span class=\"none\">".ENOUGH_RESOURCES." ".$time[0]." at ".$time[1]."</span></div></td>";
 					} else {
 						echo "<br><span class=\"none\">".CROP_NEGATIVE."</span></div></td>";
 					}
 		            echo "<td class=\"act\"><div class=\"none\">".TOO_FEW_RESOURCES."</div></td></tr>";
 				}
-				else if ($building->getTypeLevel(13) <= $abdata['a'.$j]) {
+				else if ($building->getTypeLevel(13) <= $abdata['a'.$j]+$ups) {
 					echo "<td class=\"act\"><div class=\"none\">".UPGRADE_ARMOURY."</div></td></tr>";
 				}
-				else if (count($ABups) > 0) {
+				else if ($totalUps == 1 && !$session->plus || $totalUps > 1) {
 					echo "<td class=\"act\"><div class=\"none\">".UPGRADE_IN_PROGRESS."</div></td></tr>";
 				}
 				else if($session->access != BANNED){
-				echo "<td class=\"act\"><a class=\"research\" href=\"build.php?id=$id&amp;a=$j&amp;c=".$session->mchecker."\">".UPGRADE."</a></td></tr>";
+				    echo "<td class=\"act\"><a class=\"research\" href=\"build.php?id=$id&amp;a=$j&amp;c=".$session->mchecker."\">".UPGRADE."</a>";
+				    if($totalUps != 0) echo "<span class=\"none\"> ".WAITING."</span>";
+				    echo"</td></tr>";
 				}else{
-				echo "<td class=\"act\"><a class=\"research\" href=\"banned.php\">".UPGRADE."</a></td></tr>";
+				    echo "<td class=\"act\"><a class=\"research\" href=\"banned.php\">".UPGRADE."</a>";
+				    if($totalUps != 0) echo "<span class=\"none\"> ".WAITING."</span>";
+				    echo"</td></tr>";
 				}
 			}
 		}
@@ -63,13 +77,15 @@ echo "<div class=\"details\"><img class=\"r1\" src=\"img/x.gif\" alt=\"Lumber\"
 </table>
 
 <?php
-	if(count($ABups) > 0) {
+    if($totalUps > 0) {
 		echo "<table cellpadding=\"1\" cellspacing=\"1\" class=\"under_progress\"><thead><tr><td>".UPGRADING."</td><td>".DURATION."</td><td>".COMPLETE."</td></tr>
 </thead><tbody>";
 		$timer = 1;
 		foreach($ABups as $arms) {
 			$unit = ($session->tribe-1)*10 + substr($arms['tech'],1,2);
-			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit)."</td>";
+			echo "<tr><td class=\"desc\"><img class=\"unit u$unit\" src=\"img/x.gif\" alt=\"".$technology->getUnitName($unit)."\" title=\"".$technology->getUnitName($unit)."\" />".$technology->getUnitName($unit);
+			if($timer > 1) echo "<span class=\"none\"> ".WAITING."</span>";
+			echo "</td>";
 			echo "<td class=\"dur\"><span id=\"timer$timer\">".$generator->getTimeFormat($arms['timestamp']-time())."</span></td>";
 			$date = $generator->procMtime($arms['timestamp']);
 			echo "<td class=\"fin\"><span>".$date[1]."</span><span> hrs</span></td>";