diff --git a/GameEngine/Technology.php b/GameEngine/Technology.php
index f0f5f687..cd67c7e7 100755
--- a/GameEngine/Technology.php
+++ b/GameEngine/Technology.php
@@ -440,39 +440,68 @@ class Technology {
 			$end = 50;
 			break;
 		}
+
+		for($j=19;$j<=38;$j++) {
+		    if($buildarray['f'.$j.'t'] == 41) {
+		        $horsedrinking = $j;
+		        break;
+		    }
+		}
+
 		for($i=$start;$i<=$end;$i++) {
 			$k = $i-$start+1;
 			$unit = "u".$i;
 			$unit2 = "t".$k;
 			global $$unit;
 			$dataarray = $$unit;
-			for($j=19;$j<=38;$j++) {
-			if($buildarray['f'.$j.'t'] == 41) {
-			$horsedrinking = $j;
-			}
-			}
 			if($prisoners == 0){
-			if(isset($horsedrinking)){
-			if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
-			|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
-			|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) {
-			$upkeep += ($dataarray['pop']-1) * $array[$unit];
+    			if(isset($horsedrinking)){
+    			     if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
+    			     || ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
+    			     || ($i==6 && $buildarray['f'.$horsedrinking] == 20)
+    			     ) {
+    			         $upkeepDecrement = 0;
+    			         switch ($i) {
+    			             case 4: $upkeepDecrement = 2;
+    			                     break;
+    			                     
+    			             case 5: $upkeepDecrement = 3;
+    			             break;
+    			             
+    			             case 6: $upkeepDecrement = 4;
+    			             break;
+    			         }
+    			         $upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit];
+    			     } else {
+    			         $upkeep += $dataarray['pop'] * $array[$unit];
+    			     }
+    			} else {
+    			     $upkeep += $dataarray['pop'] * $array[$unit];
+    			}
 			} else {
-			$upkeep += $dataarray['pop'] * $array[$unit];
-			}}else{
-			$upkeep += $dataarray['pop'] * $array[$unit];
-			}
-			}else{
-			if(isset($horsedrinking)){
-			if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
-			|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
-			|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)) {
-			$upkeep += ($dataarray['pop']-1) * $array[$unit2];
-			} else {
-			$upkeep += $dataarray['pop'] * $array[$unit2];
-			}}else{
-			$upkeep += $dataarray['pop'] * $array[$unit2];
-			}
+    			if(isset($horsedrinking)){
+        			if(($i==4 && $buildarray['f'.$horsedrinking] >= 10)
+            			|| ($i==5 && $buildarray['f'.$horsedrinking] >= 15)
+            			|| ($i==6 && $buildarray['f'.$horsedrinking] == 20)
+        			) {
+        			    $upkeepDecrement = 0;
+        			    switch ($i) {
+        			        case 4: $upkeepDecrement = 2;
+        			        break;
+        			        
+        			        case 5: $upkeepDecrement = 3;
+        			        break;
+        			        
+        			        case 6: $upkeepDecrement = 4;
+        			        break;
+        			    }
+        			    $upkeep += ($dataarray['pop'] - $upkeepDecrement) * $array[$unit2];
+        			} else {
+            			$upkeep += $dataarray['pop'] * $array[$unit2];
+        			}
+    			} else {
+    			     $upkeep += $dataarray['pop'] * $array[$unit2];
+    			}
 			}
 		}
 		 //   $unit = "hero";