diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
index a552ef6..f99ffe2 100755
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImage.java
@@ -174,7 +174,7 @@ public CallbackResponse process(HttpExchange t)
 			if (j != null)
 			{
 				m_interpreter.evaluateAll(j);
-				//m_server.setLastProbeContact();
+				m_server.setLastProbeContact();
 			}
 			// Select the dummy image to send back
 			verdicts = m_interpreter.getVerdicts();
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImageMobile.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImageMobile.java
index 426edfc..d33c84c 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImageMobile.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/DummyImageMobile.java
@@ -146,7 +146,7 @@ public CallbackResponse process(HttpExchange t)
 		if (j != null)
 		{
 			m_interpreter.evaluateAll(j);
-			//m_server.setLastProbeContact();
+			m_server.setLastProbeContact();
 		}    
 		// System.out.println(j.toString());
 		// Select the dummy image to send back
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java
index 50cb23c..1be0ebb 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/PreEvaluation.java
@@ -82,7 +82,7 @@ public CallbackResponse process(HttpExchange t)
 		if (j != null)
 		{
 			m_interpreter.evaluateAll(j);
-			//m_server.setLastProbeContact();
+			m_server.setLastProbeContact();
 		}
 
 		// Select the dummy image to send back
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/StatusPageCallback.java b/Source/Server/src/ca/uqac/lif/cornipickle/server/StatusPageCallback.java
index 866bca0..5c42675 100755
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/StatusPageCallback.java
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/StatusPageCallback.java
@@ -39,195 +39,194 @@ class StatusPageCallback extends InterpreterCallback
 	 * queries information about the server's state.
 	 */
 	protected CornipickleServer m_server;
-  
-  public StatusPageCallback(Interpreter i, CornipickleServer s)
-  {
-    super(i, RequestCallback.Method.GET, "/status");
-    m_server = s;
-  }
-
-  @Override
-  public CallbackResponse process(HttpExchange t)
-  {
-    StringBuilder page = new StringBuilder();
-    page.append(pageHead("Cornipickle status"));
-    page.append("<h1>Cornipickle Status</h1>");
-    
-    // Show last contact with probe
-    createProbeContactMessage(m_server.getLastProbeContact(), page);
-    
-    // Compute verdicts
-    Map<StatementMetadata,Verdict> verdicts = m_interpreter.getVerdicts();
-    createStatusMessage(verdicts, page);
-    
-    //page.append("<div id=\"main-accordion\" class=\"ui-accordion\">\n");
-    
-    // Show properties
-    page.append("<h2 class=\"ui-accordion-header\">Properties</h2>\n");
-    page.append("<p><a href=\"/reset\">Reset history</a></p>\n");
-    //page.append("<div class=\"ui-accordion-content\">\n");
-    createPropertyList(verdicts, page);
-    //page.append("</div>\n");
-    page.append("<div class=\"clearer\"></div>\n");
-    
-    // Show predicates
-    page.append("<h2 class=\"ui-accordion-header\">Predicates</h2>\n");
-    //page.append("<div class=\"ui-accordion-content\">\n");
-    createPredicateList(m_interpreter.getPredicates(), page);
-    //page.append("</div>\n");
-    page.append("<div class=\"clearer\"></div>\n");
-    
-    // Show sets
-    page.append("<h2 class=\"ui-accordion-header\">Sets</h2>\n");
-    //page.append("<div class=\"ui-accordion-content\">\n");
-    createSetList(m_interpreter.getSetDefinitions(), page);
-    //page.append("</div>\n");
-    page.append("<div class=\"clearer\"></div>\n");
-    
-    //page.append("</div> <!-- /main-accordion -->\n");
-
-    // Show box to add new properties
-    page.append("\n<div id=\"add-properties\">\n");
-    page.append("<h2>Add properties</h2>\n\n");
-    page.append("<p>Type here the Cornipickle properties you want to add.</p>\n");
-    page.append("<form method=\"post\" action=\"add\">\n");
-    page.append("<div><textarea name=\"properties\" rows=\"10\" cols=\"40\"></textarea></div>\n");
-    page.append("<input type=\"submit\" />\n");
-    page.append("</form>\n");
-    page.append("</div>\n");
-    page.append(pageFoot());
-    String page_string = page.toString();
-    CallbackResponse out = new CallbackResponse(t, CallbackResponse.HTTP_OK, page_string, CallbackResponse.ContentType.HTML);
-    out.disableCaching();
-    return out;
-  }
-
-  protected void createSetList(List<SetDefinition> sets, StringBuilder page)
-  {
-    page.append("<ul class=\"sets\">\n");
-    for (SetDefinition sd : sets)
-    {
-        page.append("<li>").append(HtmlFormatter.format(sd)).append("</li>\n");
-    }
-    page.append("</ul>"); 
-  }
-  
-  protected void createPredicateList(List<PredicateDefinition> preds, StringBuilder page)
-  {
-    page.append("<ul class=\"predicates\">\n");
-    for (PredicateDefinition pd : preds)
-    {
-        page.append("<li class=\"predicate-definition-item ").append(pd.getRuleName()).append("\">");
-        page.append(HtmlFormatter.format(pd)).append("</li>\n");
-    }
-    page.append("</ul>");    
-  }
-  
-  protected static void createProbeContactMessage(Date last_contact, StringBuilder page)
-  {
-  	// TODO: the refactoring is such that this callback no longer has access to the
-  	// server
-    if (last_contact == null)
-    {
-        page.append("<p id=\"last-probe-contact\">No contact with probe so far.</p>\n");
-    }
-    else
-    {
-        page.append("<p id=\"last-probe-contact\">Last contact with probe <span id=\"time-string\">just now</span>");
-        //page.append(last_contact)
-        page.append("</p>\n");
-    }
-  }
-  
-  protected static void createStatusMessage(Map<StatementMetadata,Verdict> verdicts, StringBuilder page)
-  {
-    int num_errors = 0;
-    for (StatementMetadata key : verdicts.keySet())
-    {
-      Verdict v = verdicts.get(key);
-      if (v.is(Verdict.Value.FALSE))
-      {
-        num_errors++;
-      }
-    }
-    if (num_errors == 0)
-    {
-        if (verdicts.isEmpty())
-        {
-            page.append("<p class=\"verdicts-empty\">Cornipickle has no property to evaluate.</p>");
-        }
-        else
-        {
-            page.append("<p class=\"verdicts-no-error\">All's well! All properties evaluate to true.</p>"); 
-        }
-    }
-    else if (num_errors == 1)
-    {
-        page.append("<p class=\"verdicts-errors\">Oops! There is a problem with some property.</p>");
-    }
-    else
-    {
-        page.append("<p class=\"verdicts-errors\">Oops! There is a problem with ").append(num_errors).append(" properties.</p>");
-    }
-  }
-  
-  protected void createPropertyList(Map<StatementMetadata,Verdict> verdicts, StringBuilder verdict_string)
-  {
-    // Ignore unique ID given by interpreter to each statement
-    HashSet<String> ignored_attributes = new HashSet<String>();
-    ignored_attributes.add("uniqueid");
-    verdict_string.append("<ul class=\"verdicts\">\n");
-    for (StatementMetadata key : verdicts.keySet())
-    {
-      Verdict v = verdicts.get(key);
-      String class_name = "inconclusive";
-      if (v.is(Verdict.Value.TRUE))
-      {
-        class_name = "true";
-      }
-      else if (v.is(Verdict.Value.FALSE))
-      {
-        class_name = "false";
-      }
-      verdict_string.append("<li class=\"").append(class_name).append("\">");
-      verdict_string.append("<div class=\"property-metadata\">").append(HtmlFormatter.format(key, ignored_attributes)).append("</div>\n");
-      verdict_string.append("<div class=\"property-contents\">\n");
-      verdict_string.append(HtmlFormatter.format(m_interpreter.getProperty(key)));
-      verdict_string.append("</div>\n");
-      verdict_string.append("</li>");
-    }
-    verdict_string.append("</ul>\n");    
-  }
-  
-  protected StringBuilder pageHead(String title)
-  {
-    StringBuilder page = new StringBuilder();
-    page.append("<!DOCTYPE html>\n");
-    page.append("<html>\n");
-    page.append("<head>\n");
-    page.append("<title>").append(title).append("</title>\n");
-    page.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n");
-    page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"https://code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css\" />\n");
-    page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"screen.css\" />\n");
-    page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"colouring.css\" />\n");
-    page.append("<script src=\"https://code.jquery.com/jquery-1.11.2.min.js\"></script>\n");
-    page.append("<script src=\"https://code.jquery.com/ui/1.11.1/jquery-ui.min.js\"></script>\n");
-    page.append("<script src=\"highlight.js\"></script>\n");
-    //page.append("<script type=\"text/javascript\">\n//<![CDATA[\nprobe_last_contact = new Date(\"");
-    //page.append(getLastProbeContact()).append("\");\n//]]>\n</script>\n");
-    page.append("</head>\n<body>\n");
-    return page;
-  }
-  
-  protected StringBuilder pageFoot()
-  {
-    StringBuilder page = new StringBuilder();
-    page.append("<div id=\"footer\">\n");
-    page.append("<hr />\n");
-    Date d = new Date();
-    page.append(d);
-    page.append("</div>\n");
-    page.append("</body>\n</html>\n");
-    return page;
-  }
+
+	public StatusPageCallback(Interpreter i, CornipickleServer s)
+	{
+		super(i, RequestCallback.Method.GET, "/status");
+		m_server = s;
+	}
+
+	@Override
+	public CallbackResponse process(HttpExchange t)
+	{
+		StringBuilder page = new StringBuilder();
+		page.append(pageHead("Cornipickle status"));
+		page.append("<h1>Cornipickle Status</h1>");
+		if (m_server.getLastProbeContact() != null)
+			page.append("<script type=\"text/javascript\">probe_last_contact=" + (m_server.getLastProbeContact().getTime()) + ";</script>");
+
+		// Show last contact with probe
+		createProbeContactMessage(m_server.getLastProbeContact(), page);
+
+		// Compute verdicts
+		Map<StatementMetadata,Verdict> verdicts = m_interpreter.getVerdicts();
+		createStatusMessage(verdicts, page);
+
+		//page.append("<div id=\"main-accordion\" class=\"ui-accordion\">\n");
+
+		// Show properties
+		page.append("<h2 class=\"ui-accordion-header\">Properties</h2>\n");
+		page.append("<p><a href=\"/reset\">Reset history</a></p>\n");
+		//page.append("<div class=\"ui-accordion-content\">\n");
+		createPropertyList(verdicts, page);
+		//page.append("</div>\n");
+		page.append("<div class=\"clearer\"></div>\n");
+
+		// Show predicates
+		page.append("<h2 class=\"ui-accordion-header\">Predicates</h2>\n");
+		//page.append("<div class=\"ui-accordion-content\">\n");
+		createPredicateList(m_interpreter.getPredicates(), page);
+		//page.append("</div>\n");
+		page.append("<div class=\"clearer\"></div>\n");
+
+		// Show sets
+		page.append("<h2 class=\"ui-accordion-header\">Sets</h2>\n");
+		//page.append("<div class=\"ui-accordion-content\">\n");
+		createSetList(m_interpreter.getSetDefinitions(), page);
+		//page.append("</div>\n");
+		page.append("<div class=\"clearer\"></div>\n");
+
+		//page.append("</div> <!-- /main-accordion -->\n");
+
+		// Show box to add new properties
+		page.append("\n<div id=\"add-properties\">\n");
+		page.append("<h2>Add properties</h2>\n\n");
+		page.append("<p>Type here the Cornipickle properties you want to add.</p>\n");
+		page.append("<form method=\"post\" action=\"add\">\n");
+		page.append("<div><textarea name=\"properties\" rows=\"10\" cols=\"40\"></textarea></div>\n");
+		page.append("<input type=\"submit\" />\n");
+		page.append("</form>\n");
+		page.append("</div>\n");
+		page.append(pageFoot());
+		String page_string = page.toString();
+		CallbackResponse out = new CallbackResponse(t, CallbackResponse.HTTP_OK, page_string, CallbackResponse.ContentType.HTML);
+		out.disableCaching();
+		return out;
+	}
+
+	protected void createSetList(List<SetDefinition> sets, StringBuilder page)
+	{
+		page.append("<ul class=\"sets\">\n");
+		for (SetDefinition sd : sets)
+		{
+			page.append("<li>").append(HtmlFormatter.format(sd)).append("</li>\n");
+		}
+		page.append("</ul>"); 
+	}
+
+	protected void createPredicateList(List<PredicateDefinition> preds, StringBuilder page)
+	{
+		page.append("<ul class=\"predicates\">\n");
+		for (PredicateDefinition pd : preds)
+		{
+			page.append("<li class=\"predicate-definition-item ").append(pd.getRuleName()).append("\">");
+			page.append(HtmlFormatter.format(pd)).append("</li>\n");
+		}
+		page.append("</ul>");    
+	}
+
+	protected void createProbeContactMessage(Date last_contact, StringBuilder page)
+	{
+		if (last_contact == null)
+		{
+			page.append("<p id=\"last-probe-contact\">No contact with probe so far.</p>\n");
+		}
+		else
+		{
+			page.append("<p id=\"last-probe-contact\">Last contact with probe <span id=\"time-string\">just now</span>");
+			page.append("</p>\n");
+		}
+	}
+
+	protected static void createStatusMessage(Map<StatementMetadata,Verdict> verdicts, StringBuilder page)
+	{
+		int num_errors = 0;
+		for (StatementMetadata key : verdicts.keySet())
+		{
+			Verdict v = verdicts.get(key);
+			if (v.is(Verdict.Value.FALSE))
+			{
+				num_errors++;
+			}
+		}
+		if (num_errors == 0)
+		{
+			if (verdicts.isEmpty())
+			{
+				page.append("<p class=\"verdicts-empty\">Cornipickle has no property to evaluate.</p>");
+			}
+			else
+			{
+				page.append("<p class=\"verdicts-no-error\">All's well! All properties evaluate to true.</p>"); 
+			}
+		}
+		else if (num_errors == 1)
+		{
+			page.append("<p class=\"verdicts-errors\">Oops! There is a problem with some property.</p>");
+		}
+		else
+		{
+			page.append("<p class=\"verdicts-errors\">Oops! There is a problem with ").append(num_errors).append(" properties.</p>");
+		}
+	}
+
+	protected void createPropertyList(Map<StatementMetadata,Verdict> verdicts, StringBuilder verdict_string)
+	{
+		// Ignore unique ID given by interpreter to each statement
+		HashSet<String> ignored_attributes = new HashSet<String>();
+		ignored_attributes.add("uniqueid");
+		verdict_string.append("<ul class=\"verdicts\">\n");
+		for (StatementMetadata key : verdicts.keySet())
+		{
+			Verdict v = verdicts.get(key);
+			String class_name = "inconclusive";
+			if (v.is(Verdict.Value.TRUE))
+			{
+				class_name = "true";
+			}
+			else if (v.is(Verdict.Value.FALSE))
+			{
+				class_name = "false";
+			}
+			verdict_string.append("<li class=\"").append(class_name).append("\">");
+			verdict_string.append("<div class=\"property-metadata\">").append(HtmlFormatter.format(key, ignored_attributes)).append("</div>\n");
+			verdict_string.append("<div class=\"property-contents\">\n");
+			verdict_string.append(HtmlFormatter.format(m_interpreter.getProperty(key)));
+			verdict_string.append("</div>\n");
+			verdict_string.append("</li>");
+		}
+		verdict_string.append("</ul>\n");    
+	}
+
+	protected StringBuilder pageHead(String title)
+	{
+		StringBuilder page = new StringBuilder();
+		page.append("<!DOCTYPE html>\n");
+		page.append("<html>\n");
+		page.append("<head>\n");
+		page.append("<title>").append(title).append("</title>\n");
+		page.append("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n");
+		page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"https://code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css\" />\n");
+		page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"screen.css\" />\n");
+		page.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"colouring.css\" />\n");
+		page.append("<script src=\"https://code.jquery.com/jquery-1.11.2.min.js\"></script>\n");
+		page.append("<script src=\"https://code.jquery.com/ui/1.11.1/jquery-ui.min.js\"></script>\n");
+		page.append("<script src=\"highlight.js\"></script>\n");
+		//page.append("<script type=\"text/javascript\">\n//<![CDATA[\nprobe_last_contact = new Date(\"");
+		//page.append(getLastProbeContact()).append("\");\n//]]>\n</script>\n");
+		page.append("</head>\n<body>\n");
+		return page;
+	}
+
+	protected StringBuilder pageFoot()
+	{
+		StringBuilder page = new StringBuilder();
+		page.append("<div id=\"footer\">\n");
+		page.append("<hr />\n");
+		Date d = new Date();
+		page.append(d);
+		page.append("</div>\n");
+		page.append("</body>\n</html>\n");
+		return page;
+	}
 } 
\ No newline at end of file
diff --git a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/highlight.js b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/highlight.js
index b8bb647..a58b6f7 100644
--- a/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/highlight.js
+++ b/Source/Server/src/ca/uqac/lif/cornipickle/server/resource/highlight.js
@@ -17,7 +17,7 @@ highlight_predicate = function(predicate_name)
 time_since = function(ts)
 {
     now = new Date();
-    //ts = new Date(ts*1000);
+    ts = new Date(ts*1000);
     var delta = now.getTime() - ts.getTime();
     delta = delta/1000; //us to s
     var ps, pm, ph, pd, min, hou, sec, days;
diff --git a/Source/ServerTest/src/ca/uqac/lif/cornipickle/server/StatusPageCallbackTest.java b/Source/ServerTest/src/ca/uqac/lif/cornipickle/server/StatusPageCallbackTest.java
index 1776cb7..2a7b58b 100644
--- a/Source/ServerTest/src/ca/uqac/lif/cornipickle/server/StatusPageCallbackTest.java
+++ b/Source/ServerTest/src/ca/uqac/lif/cornipickle/server/StatusPageCallbackTest.java
@@ -144,36 +144,6 @@ public void testStatusPageCallbackTestCreatePredicateList(){
 
     }*/
 
-
-    @Test
-    public void TestStatusPageCallbackCreateProbeContactMessageNull(){
-
-
-
-        StringBuilder result = new StringBuilder();
-
-        StatusPageCallback.createProbeContactMessage(null, result);
-
-        String expected = "<p id=\"last-probe-contact\">No contact with probe so far.</p>\n";
-
-        assertTrue(expected.equals(result.toString()));
-
-    }
-
-
-    @Test
-    public void TestStatusPageCallbackCreateProbeContactMessageOk(){
-
-        StringBuilder result = new StringBuilder();
-
-        StatusPageCallback.createProbeContactMessage(new Date(), result);
-
-        String expected = "<p id=\"last-probe-contact\">Last contact with probe <span id=\"time-string\">just now</span></p>\n";
-
-        assertTrue(expected.equals(result.toString()));
-
-    }
-
     @Test
     public void TestStatusPageCallBackFooter(){