diff --git a/GameEngine/Ranking.php b/GameEngine/Ranking.php
index 506509c7..99f98697 100644
--- a/GameEngine/Ranking.php
+++ b/GameEngine/Ranking.php
@@ -19,46 +19,16 @@
         	}
 			
 			public function getUserRank($username) {
-			if(INCLUDE_ADMIN==true){
-        		$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, (
-
-				SELECT SUM( " . TB_PREFIX . "vdata.pop ) 
-				FROM " . TB_PREFIX . "vdata
-				WHERE " . TB_PREFIX . "vdata.owner = userid
-				)totalpop
-				FROM " . TB_PREFIX . "users
-				ORDER BY totalpop DESC, userid ASC";
-				$result = mysql_query($q);
-				$i = 1;
-				$myrank = 0;
-				while($row = mysql_fetch_array($result)) {
-					if($row['username'] == $username){
-						$myrank = $i;
-					}
-					$i++;
-				}
+			$ranking = $this->getRank();
+			$start = $_SESSION['start']+1;
+			if(count($ranking) > 0) {
+            for($i=$start;$i<($start+20);$i++) {
+			if($ranking[$i]['username'] == $username && $ranking[$i] != "pad") {
+			$myrank = $i;
+			}
+			}
+			}
 				return $myrank;
-			}else{
-        		$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, (
-
-				SELECT SUM( " . TB_PREFIX . "vdata.pop ) 
-				FROM " . TB_PREFIX . "vdata
-				WHERE " . TB_PREFIX . "vdata.owner = userid
-				)totalpop
-				FROM " . TB_PREFIX . "users
-				WHERE " . TB_PREFIX . "users.id != 0 and id != 1 and id != 2 and id != 4 and id != 5
-				ORDER BY totalpop DESC, userid ASC";
-				$result = mysql_query($q);
-				$i = 1;
-				$myrank = 0;
-				while($row = mysql_fetch_array($result)) {
-					if($row['username'] == $username){
-						$myrank = $i;
-					}
-					$i++;
-				}
-				return $myrank;
-				}
         	}
 
         	public function procRankReq($get) {
diff --git a/install/data/sql.sql b/install/data/sql.sql
index d9beccd1..a39ad425 100644
--- a/install/data/sql.sql
+++ b/install/data/sql.sql
@@ -1375,6 +1375,26 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%users` (
   `friend17` int(10) unsigned NOT NULL,
   `friend18` int(10) unsigned NOT NULL,
   `friend19` int(10) unsigned NOT NULL,
+  `friend0wait` int(10) unsigned NOT NULL,
+  `friend1wait` int(10) unsigned NOT NULL,
+  `friend2wait` int(10) unsigned NOT NULL,
+  `friend3wait` int(10) unsigned NOT NULL,
+  `friend4wait` int(10) unsigned NOT NULL,
+  `friend5wait` int(10) unsigned NOT NULL,
+  `friend6wait` int(10) unsigned NOT NULL,
+  `friend7wait` int(10) unsigned NOT NULL,
+  `friend8wait` int(10) unsigned NOT NULL,
+  `friend9wait` int(10) unsigned NOT NULL,
+  `friend10wait` int(10) unsigned NOT NULL,
+  `friend11wait` int(10) unsigned NOT NULL,
+  `friend12wait` int(10) unsigned NOT NULL,
+  `friend13wait` int(10) unsigned NOT NULL,
+  `friend14wait` int(10) unsigned NOT NULL,
+  `friend15wait` int(10) unsigned NOT NULL,
+  `friend16wait` int(10) unsigned NOT NULL,
+  `friend17wait` int(10) unsigned NOT NULL,
+  `friend18wait` int(10) unsigned NOT NULL,
+  `friend19wait` int(10) unsigned NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8 AUTO_INCREMENT=5 ;