diff --git a/Templates/Build/16_incomming.tpl b/Templates/Build/16_incomming.tpl
index 19998470..bdd5d61d 100644
--- a/Templates/Build/16_incomming.tpl
+++ b/Templates/Build/16_incomming.tpl
@@ -69,7 +69,7 @@ if ($units[$y]['sort_type']==3){
                   <td colspan=\"10\">";
                   echo "<a>Taskmaster's troops</a>";
                   echo "</td></tr></thead><tbody class=\"units\">";
-                  $tribe = 4;
+                  $tribe = $session->tribe;
                   $start = ($tribe-1)*10+1;
                   $end = ($tribe*10);
                   echo "<tr><th>&nbsp;</th>";
@@ -78,16 +78,7 @@ if ($units[$y]['sort_type']==3){
                   }
                   echo "</tr><tr><th>Troops</th>";
                   for($i=$start;$i<=($end);$i++) {
-				  $totalunits = $units[$y]['t1']+$units[$y]['t2']+$units[$y]['t3']+$units[$y]['t4']+$units[$y]['t5']+$units[$y]['t6']+$units[$y]['t7']+$units[$y]['t8']+$units[$y]['t9']+$units[$y]['t10']+$units[$y]['t11'];
-				  if($totalunits > $building->getTypeLevel(16)){
                  		echo "<td class=\"none\">?</td>";
-                  }else{
-				  if($units[$y]['t'.$i] == 0) {
-                    echo "<td class=\"none\">0</td>";
-				  }else{
-					echo "<td>?</td>";
-                  }	
-				  }
 				  }
                   echo "</tr></tbody>";
                   echo '
diff --git a/Templates/Notice/1.tpl b/Templates/Notice/1.tpl
index 35243b90..100a23dd 100644
--- a/Templates/Notice/1.tpl
+++ b/Templates/Notice/1.tpl
@@ -218,8 +218,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -296,5 +376,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/1x.tpl b/Templates/Notice/1x.tpl
index dce6d5b9..937b671b 100644
--- a/Templates/Notice/1x.tpl
+++ b/Templates/Notice/1x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/2.tpl b/Templates/Notice/2.tpl
index 0559a01d..f0e4c859 100644
--- a/Templates/Notice/2.tpl
+++ b/Templates/Notice/2.tpl
@@ -1,7 +1,7 @@
 <?php
 $dataarray = explode(",",$message->readingNotice['data']);
 //var_dump($dataarray);
-if($dataarray[147]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
+if(isset($dataarray[147]) and $dataarray[147]!=0){$colspan="11";}else{$colspan="10";}
 ?>
 <table cellpadding="1" cellspacing="1" id="report_surround">
 			<thead>
@@ -36,7 +36,7 @@ for($i=$start;$i<=($start+9);$i++) {
 	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 
-if ($dataarray[147]!="" or $dataarray[147]!=0){
+if(isset($dataarray[147]) and $dataarray[147]!=0){
 	echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
 }
 
@@ -49,7 +49,7 @@ for($i=3;$i<=12;$i++) {
     	echo "<td>".$dataarray[$i]."</td>";
     }
 }
-if ($dataarray[147]!="" or $dataarray[147]!=0){
+if(isset($dataarray[147]) and $dataarray[147]!=0){
 	echo "<td>$dataarray[147]</td>";
 }
 echo "<tr><th>Casualties</th>";
@@ -61,7 +61,7 @@ for($i=13;$i<=22;$i++) {
     	echo "<td>".$dataarray[$i]."</td>";
     }
 }
-if ($dataarray[147]!="" or $dataarray[147]!=0){
+if(isset($dataarray[147]) and $dataarray[147]!=0){
 	if ($dataarray[148]==0){$tdclass='class="none"';}
 	echo "<td $tdclass>$dataarray[148]</td>";
 }
@@ -217,8 +217,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -295,5 +375,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/2x.tpl b/Templates/Notice/2x.tpl
index dce6d5b9..937b671b 100644
--- a/Templates/Notice/2x.tpl
+++ b/Templates/Notice/2x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl
index 9c4bb995..f03a4637 100644
--- a/Templates/Notice/3.tpl
+++ b/Templates/Notice/3.tpl
@@ -5,7 +5,7 @@
 ##                  GIT HUB REV                           ##  
 ############################################################
 $dataarray = explode(",",$message->readingNotice['data']);
-if($dataarray[151]!='' or $dataarray!=0){$colspan="11";}else{$colspan="10";}
+if(isset($dataarray[151]) and $dataarray[151]!=0){$colspan="11";}else{$colspan="10";}
 ?>
 <table cellpadding="1" cellspacing="1" id="report_surround">
 			<thead>
@@ -39,7 +39,7 @@ $start = ($tribe-1)*10+1;
 for($i=$start;$i<=($start+9);$i++) {
 	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
-if ($dataarray[151]!="" or $dataarray[151]!=0){
+if(isset($dataarray[151]) and $dataarray[151]!=0){
 	echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
@@ -51,7 +51,7 @@ for($i=3;$i<=12;$i++) {
     	echo "<td>".$dataarray[$i]."</td>";
     }
 }
-if ($dataarray[151]!="" or $dataarray[151]!=0){
+if(isset($dataarray[151]) and $dataarray[151]!=0){
 	echo "<td>$dataarray[151]</td>";
 }
 echo "<tr><th>Casualties</th>";
@@ -63,7 +63,7 @@ for($i=13;$i<=22;$i++) {
     	echo "<td>".$dataarray[$i]."</td>";
     }
 }
-if ($dataarray[151]!="" or $dataarray[151]!=0){
+if(isset($dataarray[151]) and $dataarray[151]!=0){
 	if ($dataarray[152]==0){$tdclass='class="none"';}
 	echo "<td $tdclass>$dataarray[152]</td>";
 }
diff --git a/Templates/Notice/4.tpl b/Templates/Notice/4.tpl
index a58bd2e7..5a66bca7 100644
--- a/Templates/Notice/4.tpl
+++ b/Templates/Notice/4.tpl
@@ -204,8 +204,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -282,5 +362,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/4x.tpl b/Templates/Notice/4x.tpl
index dce6d5b9..1e41eb5d 100644
--- a/Templates/Notice/4x.tpl
+++ b/Templates/Notice/4x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/5.tpl b/Templates/Notice/5.tpl
index a58bd2e7..5a66bca7 100644
--- a/Templates/Notice/5.tpl
+++ b/Templates/Notice/5.tpl
@@ -204,8 +204,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -282,5 +362,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/5x.tpl b/Templates/Notice/5x.tpl
index dce6d5b9..1e41eb5d 100644
--- a/Templates/Notice/5x.tpl
+++ b/Templates/Notice/5x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/6.tpl b/Templates/Notice/6.tpl
index a58bd2e7..5a66bca7 100644
--- a/Templates/Notice/6.tpl
+++ b/Templates/Notice/6.tpl
@@ -204,8 +204,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=139;$i<=148;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -282,5 +362,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file
diff --git a/Templates/Notice/6x.tpl b/Templates/Notice/6x.tpl
index dce6d5b9..1e41eb5d 100644
--- a/Templates/Notice/6x.tpl
+++ b/Templates/Notice/6x.tpl
@@ -219,8 +219,88 @@ for($i=87;$i<=96;$i++) {
 ?>
 </tr></tbody></table>
 
+<?php }
+if($dataarray[98]==1 and $dataarray[31]!=4){
+if ($dataarray[97]=='1'){ 
+$start=31; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=98;$i<=107;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=118;$i<=127;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
 <?php } ?>
-<?php  if ($dataarray[97]=='1'){ 
+<?php  if ($dataarray[128]=='1'){
+$start=41; ?>	
+	<table cellpadding="1" cellspacing="1" class="defender">
+	<thead>
+	<tr>
+	<td class="role">Defender</th>
+	<td colspan="10"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+	</tr></thead>
+	<tbody class="units">
+	<tr>
+	<td>&nbsp;</td>
+	
+	
+	<?php
+for($i=$start;$i<=($start+9);$i++) {
+	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+}
+echo "</tr><tr><th>Troops</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+echo "<tr><th>Casualties</th>";
+for($i=129;$i<=138;$i++) {
+	if($dataarray[$i] == 0) {
+    	echo "<td class=\"none\">0</td>";
+    }
+    else {
+    	echo "<td>".$dataarray[$i]."</td>";
+    }
+}
+?>
+</tr></tbody></table>
+
+<?php }
+	}else{
+if ($dataarray[97]=='1'){ 
 $start=31; ?>	
 	<table cellpadding="1" cellspacing="1" class="defender">
 	<thead>
@@ -297,5 +377,5 @@ for($i=129;$i<=138;$i++) {
 ?>
 </tr></tbody></table>
 
-<?php } ?>
+<?php }} ?>
 </td></tr></tbody></table>
\ No newline at end of file