diff --git a/includes/current-character.php b/includes/current-character.php
index 146e99d..b9f6fc3 100644
--- a/includes/current-character.php
+++ b/includes/current-character.php
@@ -4,12 +4,12 @@ if (isset($_SESSION['userid'])){
     echo '<tr><th>Title</th><th>Title Rank</th><th>Title Points</th><th>Current Rank</th><th>Points Remaining</th><th>Max Title %</th><th>Next Rank</th></tr>';
 	if ($_SESSION['prefcharid'] == "0") {
 		// $gcc = Get Current Character stats
-		$gcc = $con->prepare("SELECT * FROM gwstats WHERE charid = 0 AND accid = ? AND userid = ? ORDER BY percent DESC, currentstrank DESC, percent ASC");
+		$gcc = $con->prepare("SELECT * FROM gwstats WHERE charid = 0 AND accid = ? AND userid = ? ORDER BY currentstrank DESC, percent DESC");
 		$gcc->bind_param("ii", $_SESSION['prefaccid'], $_SESSION['userid']);
 	} else {
 		// $gcc = Get Current Character stats
-		$gcc = $con->prepare("SELECT * FROM gwstats WHERE charid = 0 AND accid = ? AND userid = ? UNION ALL SELECT * FROM gwstats WHERE charid = ? AND accid = ? AND userid = ? ORDER BY percent DESC, currentstrank DESC, percent ASC");
-		$gcc->bind_param("iiiii", $_SESSION['prefaccid'], $_SESSION['userid'], $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
+		$gcc = $con->prepare("SELECT * FROM gwstats WHERE charid IN (0, ?) AND accid = ? AND userid = ? ORDER BY currentstrank DESC, percent DESC");
+		$gcc->bind_param("iii", $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
 	}
 	$gcc->execute();
 	$gccres = $gcc->get_result();
diff --git a/includes/update-chartitleranks.php b/includes/update-chartitleranks.php
index 0b9dafc..6c6f52a 100644
--- a/includes/update-chartitleranks.php
+++ b/includes/update-chartitleranks.php
@@ -38,5 +38,6 @@ if (isset($_SESSION['userid'])) {
         $irs->close();
         echo 'Title entered!<br /></br />';
     }
+    include_once ('update-gwamm.php');
 }
 ?>
\ No newline at end of file
diff --git a/includes/update-gwamm.php b/includes/update-gwamm.php
new file mode 100644
index 0000000..58dd34d
--- /dev/null
+++ b/includes/update-gwamm.php
@@ -0,0 +1,58 @@
+<?php
+if (isset($_SESSION['userid'])){
+    // $ggid = Get Gwamm ID
+    $ggid = $con->prepare("SELECT titlenameid FROM gwtitles WHERE gwamm = 1");
+    $ggid->execute();
+    $ggid->bind_result($gwammid);
+    $ggid->fetch();
+    $ggid->close();
+    if ($gwammid == NULL) {
+        echo 'No title has been set for GWAMM status - please do so --><a href="titlemanager.php" class="navlink">NOW</a><--<br />';
+		include_once ('footer.php');
+		exit();
+    } else {
+        // $ggr Get Gwamm Rank
+        $ggr = $con->prepare("SELECT COUNT(*) FROM gwstats WHERE charid IN (0, ?) AND gwamm = 0 AND percent >= 100 AND accid = ? AND userid = ?");
+        $ggr->bind_param("iii", $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
+        $ggr->execute();
+        $ggr->bind_result($gwamm);
+        $ggr->fetch();
+        $ggr->close();
+        // $gcr = Get Current Rank
+        $gcr = $con->prepare("SELECT stnameid, stname, strank FROM gwsubtitles WHERE titlenameid = ? AND stpoints <= ? ORDER BY stpoints DESC LIMIT 1");
+        $gcr->bind_param("ii", $gwammid, $gwamm);
+        $gcr->execute();
+        $gcr->bind_result($stnameid, $stname, $strank);
+        $gcr->fetch();
+        $gcr->close();
+    	// $gpc = Get Percentage Completed
+        $gpc = $con->prepare("SELECT stpoints FROM gwsubtitles WHERE titlenameid = ? ORDER BY stnameid DESC LIMIT 1");
+        $gpc->bind_param("i", $gwammid);
+        $gpc->execute();
+        $gpc->bind_result($pmr); //$pmr = Percentage Max Rank
+        $gpc->fetch();
+        $gpc->close();
+    	$progress = ceil(($gwamm / $pmr) * 100);
+        // $gcg = Get Character GWAMM (to see if we're tracking the GWAMM title or not)
+        $gcg = $con->prepare("SELECT COUNT(*) FROM gwstats WHERE titlenameid = ? AND charid = ? AND accid = ? AND userid = ?");
+        $gcg->bind_param("iiii", $gwammid, $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
+        $gcg->execute();
+        $gcg->bind_result($cgs); // $cgs = Character GWAMM Status
+        $gcg->fetch();
+        $gcg->close();
+        if ($cgs > 0) {
+            // $ugt = Update GWAMM Title
+            $ugt = $con->prepare("UPDATE gwstats SET stnameid = ?, titlepoints = ?, currentstrankname = ?, currentstrank = ?, percent = ? WHERE titlenameid = ? AND charid = ? AND accid = ? AND userid = ?");
+            $ugt->bind_param("iisiiiiii", $stnameid, $gwamm, $stname, $strank, $progress, $gwammid, $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
+            $ugt->execute();
+            $ugt->close();
+        } else {
+            // $igt = Insert GWAMM Title
+            $igt = $con->prepare("INSERT INTO gwstats (titlenameid, stnameid, titlepoints, currentstrankname, currentstrank, percent, gwamm, charid, accid, userid) VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, ?)");
+            $igt->bind_param("iiisiiiii", $gwammid, $stnameid, $gwamm, $stname, $strank, $progress, $_SESSION['prefcharid'], $_SESSION['prefaccid'], $_SESSION['userid']);
+            $igt->execute();
+            $igt->close();
+        }
+    }
+}
+?>
\ No newline at end of file