Index: trunk/src/tmcsim/client/CADClient.java
===================================================================
--- trunk/src/tmcsim/client/CADClient.java	(revision 2)
+++ trunk/src/tmcsim/client/CADClient.java	(revision 33)
@@ -60,5 +60,5 @@
  * @version $Date: 2009/04/17 16:27:47 $ $Revision: 1.8 $
  */
-/*Hai :3  yeeeee*/
+
 public class CADClient extends UnicastRemoteObject implements
         CADClientInterface {
@@ -113,4 +113,6 @@
     private CADClientInterface client = this;
 
+    private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
+    
     /**
      * Constructor. Initialize data from parsed properties file. Create a socket
@@ -319,4 +321,5 @@
                     e);
         }
+        
 
         // Ensure that the properties file does not have null values for the
@@ -473,17 +476,12 @@
      */
     public static void main(String[] args) {
-        System.setProperty("CAD_CLIENT_PROPERTIES",
-                "config/cad_client_config.properties");
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
 
         try {
-            if (System.getProperty("CAD_CLIENT_PROPERTIES") != null) {
-                UIManager.setLookAndFeel(UIManager
-                        .getSystemLookAndFeelClassName());
-
-                new CADClient(System.getProperty("CAD_CLIENT_PROPERTIES"));
-            } else {
-                throw new Exception(
-                        "CAD_CLIENT_PROPERTIES system property not defined.");
-            }
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new CADClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+         
         } catch (Exception e) {
             cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",