diff --git a/application/controllers/Api.php b/application/controllers/Api.php
index 8857167d..9e88e859 100644
--- a/application/controllers/Api.php
+++ b/application/controllers/Api.php
@@ -455,18 +455,14 @@ class API extends CI_Controller {
 	}
 
 
-	/*
-	* ENDPOINT for Rig Control
-	*
-	* Note: timestamp should always be in UTC
-	*/
+	/* ENDPOINT for Rig Control */
 
 	function radio() {
 		header('Content-type: application/json');
 
 		$this->load->model('api_model');
 
-		//$json = '{"radio":"FT-950","frequency":14075,"mode":"SSB","timestamp":"2012/04/07 16:47:31"}';
+		//$json = '{"radio":"FT-950","frequency":14075,"mode":"SSB","timestamp":"2012/04/07 16:47"}';
 
 		$this->load->model('cat');
 
@@ -480,10 +476,6 @@ class API extends CI_Controller {
 		   die();
 		}
 
-		if(!isset($obj['timestamp'])) {
-			$obj['timestamp'] = gmdate('Y/m/d H:i:s'); // in UTC
-		}
-
 		// Store Result to Database
 		$this->cat->update($obj);
 
diff --git a/application/controllers/Radio.php b/application/controllers/Radio.php
index 0b7a14e8..d8c95838 100755
--- a/application/controllers/Radio.php
+++ b/application/controllers/Radio.php
@@ -120,9 +120,8 @@
 				}
 
 				// Calculate how old the data is in minutes 
-				$timezone = new DateTimeZone("UTC");
-				$datetime1 = new DateTime("now", $timezone);
-				$datetime2 = new DateTime($row->timestamp, $timezone);
+				$datetime1 = new DateTime(); // Today's Date/Time
+				$datetime2 = new DateTime($row->newtime);
 				$interval = $datetime1->diff($datetime2);
 
 				$minutes = $interval->days * 24 * 60;
diff --git a/application/models/Cat.php b/application/models/Cat.php
index 4306cdbe..2f92b788 100644
--- a/application/models/Cat.php
+++ b/application/models/Cat.php
@@ -102,7 +102,7 @@
 
 		function radio_status($id) {
 
-			return $this->db->query('SELECT * FROM `cat` WHERE id = '.$id.' ');
+			return $this->db->query('SELECT *, CONVERT_TZ(`timestamp`, @@session.time_zone, \'+00:00\' ) as newtime FROM `cat` WHERE id = '.$id.' ');
 
 		}