Index: trunk/src/tmcsim/cadsimulator/CADScreenManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/CADScreenManager.java	(revision 2)
+++ trunk/src/tmcsim/cadsimulator/CADScreenManager.java	(revision 123)
@@ -139,6 +139,6 @@
         screenNum = screenNum.next();       
 
-        CADScreenModel.theCADTime = CADSimulator.getCADTime();
-        CADScreenModel.theCADDate = CADSimulator.getCADDate();  
+        CADScreenModel.theCADTime = CADServer.getCADTime();
+        CADScreenModel.theCADDate = CADServer.getCADDate();  
             
         messageMap = new TreeMap<CADRoutedMessage, Boolean>();     
@@ -158,9 +158,9 @@
      */  
     protected void updateTime() {
-        CADScreenModel.theCADTime = CADSimulator.getCADTime();
+        CADScreenModel.theCADTime = CADServer.getCADTime();
         
         setChanged();
         notifyObservers(new ObserverMessage(ObserverMessage.messageType.TIME_UPDATE, 
-                CADSimulator.getCADTime()));
+                CADServer.getCADTime()));
     }