diff --git a/GazeWebSocketServer/ClassDiagram1.cd b/GazeWebSocketServer/ClassDiagram1.cd
index 6f744df..f6356af 100644
--- a/GazeWebSocketServer/ClassDiagram1.cd
+++ b/GazeWebSocketServer/ClassDiagram1.cd
@@ -3,50 +3,30 @@
   <Class Name="GazeWebSocketServer.ConfigurationData">
     <Position X="0.5" Y="2.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>gEAAQAAAAAAAYAAAAAAAAAAQAAAgBAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>gEAAQAAAAAEAYAAAAAAAAAAQAAAgBAAAAAAAAAAAAAA=</HashCode>
       <FileName>ConfigurationData.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Class Name="GazeWebSocketServer.EyeTrackerClient">
-    <Position X="6" Y="0.5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAACAAAAAABAAAAAAEAQAAAAAAIAAAAAAAAAA=</HashCode>
-      <FileName>EyeTrackerClient.cs</FileName>
-    </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="gazeDataProcessor" />
-    </ShowAsAssociation>
-  </Class>
   <Class Name="GazeWebSocketServer.GazeCoordinateBehavior">
-    <Position X="2.5" Y="0.5" Width="2.25" />
+    <Position X="8.5" Y="0.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAgAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>GazeCoordinateBehavior.cs</FileName>
     </TypeIdentifier>
-    <ShowAsAssociation>
-      <Field Name="eyeTrackerClient" />
-    </ShowAsAssociation>
-  </Class>
-  <Class Name="GazeWebSocketServer.GazeDataProcessor">
-    <Position X="9.5" Y="0.5" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>
-      <FileName>GazeDataProcessor.cs</FileName>
-    </TypeIdentifier>
   </Class>
   <Class Name="GazeWebSocketServer.Program" Collapsed="true">
     <Position X="0.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAA=</HashCode>
+      <HashCode>AACAAAAAAAAAAAAAAAAQAAAAAAAAAAgAABAABAAAAAA=</HashCode>
       <FileName>Program.cs</FileName>
     </TypeIdentifier>
   </Class>
-  <Struct Name="GazeWebSocketServer.GazeData" Collapsed="true">
-    <Position X="0.5" Y="1.25" Width="1.5" />
+  <Class Name="GazeWebSocketServer.GazeServer">
+    <Position X="6" Y="0.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>QAAAAAAAAAAAAAAEAAgAAAAAAAAAAAAAAAAAAAAAgAA=</HashCode>
-      <FileName>GazeData.cs</FileName>
+      <HashCode>AAAAAABAACAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>GazeServer.cs</FileName>
     </TypeIdentifier>
-  </Struct>
+  </Class>
   <Font Name="Segoe UI" Size="9" />
 </ClassDiagram>
\ No newline at end of file
diff --git a/GazeWebSocketServer/Program.cs b/GazeWebSocketServer/Program.cs
index f821768..768ca50 100644
--- a/GazeWebSocketServer/Program.cs
+++ b/GazeWebSocketServer/Program.cs
@@ -13,7 +13,7 @@ namespace GazeWebSocketServer
             ConfigurationData config = ConfigurationData.ParseToObject();
 
             IBridgeTracker tracker;
-            if (args.Length > 0 && args[0] == "-d")
+            if (config.DebugFlag)
             {
                 tracker = new FakeTracker(600);
             }