diff --git a/startRaid.php b/Templates/a2b/startRaid.tpl
similarity index 78%
rename from startRaid.php
rename to Templates/a2b/startRaid.tpl
index e61d7711..7b7814ba 100644
--- a/startRaid.php
+++ b/Templates/a2b/startRaid.tpl
@@ -1,45 +1,8 @@
 <?php
-if($session->access != BANNED){
-        include ("GameEngine/Data/unitdata.php");
-        include ("GameEngine/Database.php");
-        include ("GameEngine/Generator.php");
-    function procDistanceTime2($coor,$thiscoor,$ref,$mode) {
-        $xdistance = ABS($thiscoor['x'] - $coor['x']);
-        if($xdistance > WORLD_MAX) {
-            $xdistance = (2 * WORLD_MAX + 1) - $xdistance;
-        }
-        $ydistance = ABS($thiscoor['y'] - $coor['y']);
-        if($ydistance > WORLD_MAX) {
-            $ydistance = (2 * WORLD_MAX + 1) - $ydistance;
-        }
-        $distance = SQRT(POW($xdistance,2)+POW($ydistance,2));
-        if(!$mode) {
-            if($ref == 1) {
-                $speed = 16;
-            }
-            else if($ref == 2) {
-                $speed = 12;
-            }
-            else if($ref == 3) {
-                $speed = 24; 
-            }
-            else if($ref == 300) {
-                $speed = 5;
-            }
-            else {
-                $speed = 1;
-            }
-        }
-        else {
-            $speed = $ref;
-        }
-        return round(($distance/$speed) * 3600 / INCREASE_SPEED);
-    }    
 
     $slots = $_POST['slot'];
     $lid = $_POST['lid'];
     $tribe = $_POST['tribe'];
-    $enforce = $database->getEnforceArray($r, 0);
     $getFLData = $database->getFLData($lid);
     $unitslist = $database->getFLData($lid);
     $sql = mysql_query("SELECT * FROM ".TB_PREFIX."raidlist WHERE lid = ".$lid."");
@@ -53,7 +16,8 @@ if($session->access != BANNED){
 		if($tribe == 1){ $u = "u"; } elseif($tribe == 2){ $u = "u1"; } elseif($tribe == 3){ $u = "u2"; }elseif($tribe == 4){ $u = "u3"; }else {$u = "u4"; }
 		if($tribe == 1){ $u1 = "u1"; } elseif($tribe == 2){ $u1 = "u2"; } elseif($tribe == 3){ $u1 = "u3"; }elseif($tribe == 4){ $u1 = "u4"; }else {$u1 = "u5"; }
 		if($tribe == 1){ $u2 = ""; } elseif($tribe == 2){ $u2 = "1"; } elseif($tribe == 3){ $u2 = "2"; }elseif($tribe == 4){ $u2 = "3"; }else {$u2 = "4"; }
-        if($sql1[$u.'1']>=$t1 && $sql1[$u.'2']>=$t2 && $sql1[$u.'3']>=$t3 && $sql1[$u.'4']>=$t4 && $sql1[$u.'5']>=$t5 && $sql1[$u.'6']>=$t6 && $sql1[$u.'7']>=$t7 && $sql1[$u.'8']>=$t8 && $sql1[$u.'9']>=$t9 && $sql1[$u1.'0']>=$t10 && $sql1['hero']>=$t11){        if($slots[$sid]=='on'){
+        if($sql1[$u.'1']>=$t1 && $sql1[$u.'2']>=$t2 && $sql1[$u.'3']>=$t3 && $sql1[$u.'4']>=$t4 && $sql1[$u.'5']>=$t5 && $sql1[$u.'6']>=$t6 && $sql1[$u.'7']>=$t7 && $sql1[$u.'8']>=$t8 && $sql1[$u.'9']>=$t9 && $sql1[$u1.'0']>=$t10 && $sql1['hero']>=$t11){
+        if($_POST['slot'.$sid]=='on'){
             $ckey = $generator->generateRandStr(6);
             $id = $database->addA2b($ckey,time(),$wref,$t1,$t2,$t3,$t4,$t5,$t6,$t7,$t8,$t9,$t10,$t11,4);
             
@@ -93,7 +57,19 @@ if($session->access != BANNED){
                 }
             }
             
-            $time = procDistanceTime2($from,$to,min($speeds),1);
+            $artefact = count($database->getOwnUniqueArtefactInfo2($session->uid,2,3,0));
+			$artefact1 = count($database->getOwnUniqueArtefactInfo2($village->wid,2,1,1));
+			$artefact2 = count($database->getOwnUniqueArtefactInfo2($session->uid,2,2,0));
+			if($artefact > 0){
+			$fastertroops = 3;
+			}else if($artefact1 > 0){
+			$fastertroops = 2;
+			}else if($artefact2 > 0){
+			$fastertroops = 1.5;
+			}else{
+			$fastertroops = 1;
+			}
+			$time = round($generator->procDistanceTime($from,$to,min($speeds),0)/$fastertroops);
             
             $ctar1 = 0;
             $ctar2 = 0; 
@@ -117,7 +93,4 @@ if($session->access != BANNED){
     }
 	}
 header("Location: build.php?id=39&t=99");
-}else{
-header("Location: banned.php"); 
-}
 ?>
\ No newline at end of file
diff --git a/Templates/goldClub/farmlist.tpl b/Templates/goldClub/farmlist.tpl
index 3f29c95f..79364e3d 100644
--- a/Templates/goldClub/farmlist.tpl
+++ b/Templates/goldClub/farmlist.tpl
@@ -18,7 +18,7 @@ while($row = mysql_fetch_array($sql)){
     $lvname = $database->getVillageField($row["wref"], 'name');
     if($lwref == $village->wid){
 ?>
-				<form action="startRaid.php?id=39&t=99&action=startRaid" method="post">
+				<form action="build.php?id=39&t=99&action=startRaid" method="post">
 					<input type="hidden" name="action" value="startRaid">
 					<input type="hidden" name="a" value="c35">
 					<input type="hidden" name="sort" value="distance">
@@ -71,9 +71,9 @@ $vdata = $database->getVillage($towref);
 <tr class="slotRow">
 <td class="checkbox">
 				<?php if($checked[$lid] == 0){ ?>
-                <input id="slot<?php echo $id; ?>" name="slot[<?php echo $id; ?>]" type="checkbox" class="markSlot" onclick="Travian.Game.RaidList.markSlotForRaid(<?php echo $lid; ?>, <?php echo $id; ?>, this.checked);">
+                <input id="slot<?php echo $id; ?>" name="slot<?php echo $id; ?>" type="checkbox" class="markSlot" onclick="Travian.Game.RaidList.markSlotForRaid(<?php echo $lid; ?>, <?php echo $id; ?>, this.checked);">
 				<?php }else{ ?>
-                <input id="slot<?php echo $id; ?>" name="slot[<?php echo $id; ?>]" type="checkbox" class="markSlot" checked>
+                <input id="slot<?php echo $id; ?>" name="slot<?php echo $id; ?>" type="checkbox" class="markSlot" checked>
 				<?php } ?>
 			</td>
             <td class="village">