Index: trunk/src/tmcsim/simulationmanager/SimulationManager.java
===================================================================
--- trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 14)
+++ trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 33)
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
 import tmcsim.common.CADEnums.PARAMICS_STATUS;
 import tmcsim.common.SimulationException;
@@ -45,5 +47,6 @@
 {
 
-    /**
+    private static final String CONFIG_FILE_NAME = "sim_manager_config.properties";
+	/**
      * Error logger.
      */
@@ -193,22 +196,14 @@
      * @param args Command line arguments.
      */
-    static public void main(String[] args)
-    {
-        //System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_config.properties");
+    static public void main(String[] args) {
         //System.setProperty("swing.defaultlaf", "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
-
-        try
-        {
-            if (System.getProperty("SIM_MGR_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-                new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
-            } else
-            {
-                throw new Exception("SIM_MGR_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+    	
+        try {           
+        	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+        } catch (Exception e) {
             simManLogger.logp(Level.SEVERE, "SimulationManager", "Main",
                     "Error occured initializing application", e);