diff --git a/GameEngine/Session.php b/GameEngine/Session.php
index 7eb87689..ebd69612 100755
--- a/GameEngine/Session.php
+++ b/GameEngine/Session.php
@@ -210,35 +210,31 @@ class Session {
 
  			function CheckHeroReal () {
 				global $database,$link;
-   				$hero=0;
-    			foreach($this->villages as $myvill){
-    			    $q1 = "SELECT SUM(hero) from " . TB_PREFIX . "enforcement where `from` = ".(int) $myvill;       // check if hero is send as reinforcement
-     				$result1 = mysqli_query($GLOBALS['link'],$q1);
-					if(mysqli_num_rows($result1) != 0) {
-						$he1=mysqli_fetch_array($result1);
-						$hero+=$he1[0];
-					}
-     				
-					$q2 = "SELECT SUM(hero) from " . TB_PREFIX . "units where `vref` = ".(int) $myvill;   // check if hero is on my account (all villages)
-     				$result2 = mysqli_query($GLOBALS['link'],$q2);
-     				$he2=mysqli_fetch_array($result2);
-     				$hero+=$he2[0];
-     				$q3 = "SELECT SUM(t11) from " . TB_PREFIX . "prisoners where `from` = ".(int) $myvill;   // check if hero is prisoner
-					$result3 = mysqli_query($GLOBALS['link'],$q3);
-					$he3=mysqli_fetch_array($result3);
-					$hero+=$he3[0];
-					$hero+=$database->HeroNotInVil($myvill); // check if hero is not in village (come back from attack , raid , etc.)  
-     				}
-     				$yes=true; //fix by ronix
-            if($database->getHeroDead($this->uid) and !$hero){ // check if hero is already dead
-                $yes=false;
-            }elseif($database->getHeroInRevive($this->uid) and !$hero){ // check if hero is already in revive
-                $yes=false;
-            }elseif($database->getHeroInTraining($this->uid) and !$hero){ // check if hero is in training
-                $yes=false;
-            } 
-            if($yes and !$hero) $database->KillMyHero($this->uid);
-				} 
+
+				$villageIDs = implode(', ', $this->villages);
+   				$hero = mysqli_fetch_array(
+   				    mysqli_query($database->dblink, '
+                      SELECT
+                        IFNULL((SELECT SUM(hero) from '.TB_PREFIX.'enforcement where `from` IN('.$villageIDs.')), 0) +
+                        IFNULL((SELECT SUM(hero) from '.TB_PREFIX.'units where `vref` IN('.$villageIDs.')), 0) +
+                        IFNULL((SELECT SUM(t11) from '.TB_PREFIX.'prisoners where `from` IN('.$villageIDs.')), 0) +
+                        IFNULL((SELECT SUM(t11) FROM '.TB_PREFIX.'movement, '.TB_PREFIX.'attacks WHERE '.TB_PREFIX.'movement.`from` IN('.$villageIDs.') and '.TB_PREFIX.'movement.ref = '.TB_PREFIX.'attacks.id and '.TB_PREFIX.'movement.proc = 0 and '.TB_PREFIX.'movement.sort_type = 3), 0) +
+                        IFNULL((SELECT SUM(t11) FROM '.TB_PREFIX.'movement, '.TB_PREFIX.'attacks where '.TB_PREFIX.'movement.`to` IN('.$villageIDs.') and '.TB_PREFIX.'movement.ref = '.TB_PREFIX.'attacks.id and '.TB_PREFIX.'movement.proc = 0 and '.TB_PREFIX.'movement.sort_type = 4), 0)
+                        as herocount'),
+                    MYSQLI_ASSOC
+                )['herocount'];
+
+                $isHeroElsewhere = true; //fix by ronix
+                if($database->getHeroDead($this->uid) and !$hero){ // check if hero is already dead
+                    $isHeroElsewhere = false;
+                }elseif($database->getHeroInRevive($this->uid) and !$hero){ // check if hero is already in revive
+                    $isHeroElsewhere = false;
+                }elseif($database->getHeroInTraining($this->uid) and !$hero){ // check if hero is in training
+                    $isHeroElsewhere = false;
+                }
+
+                if($isHeroElsewhere and !$hero) $database->KillMyHero($this->uid);
+            }
 
 			private function PopulateVar() {
 				global $database;
diff --git a/sql_updates.txt b/sql_updates.txt
index a9200a82..7af0b365 100644
--- a/sql_updates.txt
+++ b/sql_updates.txt
@@ -1,3 +1,8 @@
+-- 17.11.2017 -> query optimizations
+ALTER TABLE `s1_prisoners` DROP INDEX `from`, ADD INDEX `from-t11` (`from`, `t11`);
+ALTER TABLE `s1_enforcement` DROP INDEX `from`, ADD INDEX `from` (`from`, `hero`) USING BTREE;
+
+
 -- 8.11.2017 -> query optimizations and cleanups
 ALTER TABLE `s1_ww_attacks` ADD INDEX(`vid`);
 
diff --git a/var/db/struct.sql b/var/db/struct.sql
index 5e142270..9b35c986 100644
--- a/var/db/struct.sql
+++ b/var/db/struct.sql
@@ -589,7 +589,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%enforcement` (
  `vref` int(11) NULL DEFAULT '0',
  PRIMARY KEY (`id`),
  KEY `vref` (`vref`),
- KEY `from` (`from`)
+ KEY `from` (`from`,`hero`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --
@@ -1208,7 +1208,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%prisoners` (
  `t11` int(11) NULL,
  PRIMARY KEY (`id`),
  KEY `wref` (`wref`),
- KEY `from` (`from`)
+ KEY `from` (`from`,`t11`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
 --