diff --git a/routes/index.js b/routes/index.js
index 3dd1440..cd9be6b 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -22,34 +22,6 @@ router.get('/vpn', function(req, res, next){
 });
 
 
-router.get('/sensors', function(req, res, next) {
-
-	temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}, updated : {$first : "$updated"}} } ] ).exec(function(err, info){
-		var date1 = new Date();
-
-		for (var i = 0; i < info.length; i++){
-				console.log(info[i].updated.getTime());
-				console.log(Date.now());
-
-				//compared current time to last db entry - 1200000 milliseconds is 2 minutes
-				if(info[i].updated.getTime() > (Date.now() - 120000)){
-					info[i].connected = true;
-				}
-				else {
-					info[i].connected = false;
-				}
-
-				console.log(info[i].connected);
-				
-		}
-
-		res.render('sensors', {query : info});
-	});
-
-
-});
-
-
 /* GET home page. */
 router.get('/', function(req, res, next) {
 
diff --git a/routes/sensors.js b/routes/sensors.js
index 7b09c2d..f4d5b86 100644
--- a/routes/sensors.js
+++ b/routes/sensors.js
@@ -10,11 +10,30 @@ var temperature = mongoose.model('temperature');
 router.get('/', function(req, res, next) {
 
 	temperature.aggregate( [ {$sort : {location : -1, updated : -1}}, { $group : { _id : "$location", temperature : {$first : "$temperature"}, humidity : {$first : "$humidity"}, updated : {$first : "$updated"}} } ] ).exec(function(err, info){
-		var date1 = new Date();
 
 		for (var i = 0; i < info.length; i++){
-				console.log(info[i].updated.getTime());
-				console.log(Date.now());
+				var monthNames = ["January", "February", "March", "April", "May", "June",
+  									"July", "August", "September", "October", "November", "December"];
+
+				var hours = info[i].updated.getHours();
+				var minutes = info[i].updated.getMinutes();
+				var month = monthNames[info[i].updated.getMonth()];
+				var date = info[i].updated.getUTCDate();
+				var year = info[i].updated.getUTCFullYear();
+
+				var dateString = month + " " + date + ", " + year;
+
+				//converting 24 hours time to AM or PM
+				if (hours < 12){
+					info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " AM";
+				}
+				else if (hours == 12){
+					info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM";
+				}
+				else{
+					hours = hours - 12;
+					info[i].lastUpdate = dateString + " - " + hours + ":" + minutes + " PM";
+				}
 
 				//compared current time to last db entry - 1200000 milliseconds is 2 minutes
 				if(info[i].updated.getTime() > (Date.now() - 120000)){
@@ -24,13 +43,14 @@ router.get('/', function(req, res, next) {
 					info[i].connected = false;
 				}
 
-				console.log(info[i].connected);
+				
 				
 		}
 
 		res.render('sensors', {query : info});
 	});
 
+
 });
 
 router.post('/', function(req, res,next) {
diff --git a/views/sensors.ejs b/views/sensors.ejs
index 087a049..590c1e2 100644
--- a/views/sensors.ejs
+++ b/views/sensors.ejs
@@ -46,6 +46,8 @@
 			<h3><%=query[i]._id%></h3>
 			<h4>Temperature: <%=query[i].temperature%></h4>
 			<h4>Humidity: <%=query[i].humidity%></h4>
+			<span>Updated: <%=query[i].lastUpdate%></span>
+			<br>
 			<% if (query[i].connected){ %>
 			<span class="colorGreen">Connected</span>
 			<%} else {%>