diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 9fc481d16cf09edbad6e0b953d47391011b0a39e..875f49a37afd32980820079813aefa795801a04c 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -2289,6 +2289,14 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
     public void updateLastOpenFile(File file) {
         if (ConfigurationTTool.LastOpenFileDefined) {
             ConfigurationTTool.LastOpenFile = file.getPath();
+            if (ConfigurationTTool.LastOpenFile.contains(".ttool" + File.separator)) {
+            	int last = 0;
+            	for (int i = 0;i < ConfigurationTTool.LastOpenFile.length(); i++) {
+            		if (ConfigurationTTool.LastOpenFile.charAt(i) == '/')
+            			last = i;
+            	}
+            	ConfigurationTTool.LastOpenFile = ConfigurationTTool.LastOpenFile.substring(0, last);
+            }
             // Change name of action
             actions[TGUIAction.ACT_OPEN_LAST].setName(TGUIAction.ACT_OPEN_LAST, ConfigurationTTool.LastOpenFile);
         }
@@ -2484,27 +2492,16 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
         if(checkFileForOpen(file)) {
             String s = null;
-
-            try {
-                FileInputStream fis = new FileInputStream(file);
-                int nb = fis.available();
-
-                byte [] ba = new byte[nb];
-                fis.read(ba);
-                fis.close();
-                s = new String(ba);
-            } catch(Exception e) {
-                JOptionPane.showMessageDialog(frame, "File could not be opened because " + e.getMessage(), "File Error", JOptionPane.INFORMATION_MESSAGE);
-                return;
-            }
             
-            if (ConfigurationTTool.LastOpenFile.contains(".ttool/")) {
+            if (FileUtils.getExtension(file).equals("ttool")) {
             	int last = 0;
             	for (int i = 0;i < ConfigurationTTool.LastOpenFile.length(); i++) {
             		if (ConfigurationTTool.LastOpenFile.charAt(i) == '/')
             			last = i;
             	}
-            	dir = new File(ConfigurationTTool.LastOpenFile.substring(0, last));
+            	dir = file;
+            	String xml = ConfigurationTTool.LastOpenFile.substring(last, ConfigurationTTool.LastOpenFile.length()).replaceAll(".ttool", ".xml");
+            	file = new File(dir.getAbsolutePath() + File.separator + xml);
             	SpecConfigTTool.setDirConfig(dir);
             	config = new File(dir.getAbsolutePath() + "/project_config.xml");
             	try {
@@ -2518,6 +2515,20 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
             	config = null;
             	SpecConfigTTool.setBasicConfig(systemcOn);
             }
+
+            try {
+                FileInputStream fis = new FileInputStream(file);
+                int nb = fis.available();
+
+                byte [] ba = new byte[nb];
+                fis.read(ba);
+                fis.close();
+                s = new String(ba);
+            } catch(Exception e) {
+                JOptionPane.showMessageDialog(frame, "File could not be opened because " + e.getMessage(), "File Error", JOptionPane.INFORMATION_MESSAGE);
+                return;
+            }
+            
             // close current modeling
             closeTurtleModeling();
 
diff --git a/ttool/launch_configurations/config.xml b/ttool/launch_configurations/config.xml
index 89ffe884f2f75069a1cfc89daea093baa088e8f3..7e3a956c05fa4482a1a7e08e8ebc4b506f0eb8e6 100755
--- a/ttool/launch_configurations/config.xml
+++ b/ttool/launch_configurations/config.xml
@@ -47,7 +47,7 @@
 <UPPAALPropertyVerifMessage data="Formula is satisfied"/>
 <UPPAALPropertyNotVerifMessage data="Formula is NOT satisfied"/>
 <ProVerifCodeDirectory data="../proverif/" />
-<ProVerifVerifierPath data="/packages/proverif/proverif" />
+<ProVerifVerifierPath data="../../proverif" />
 <ProVerifVerifierHost data="localhost" />
 <AVATARExecutableCodeDirectory data="../executablecode/" />
 <AVATARMPSoCCodeDirectory data="../MPSoC/" />
diff --git a/ttool/runtime/config.xml b/ttool/runtime/config.xml
index 5b6fdbe09ca5c34c8935be2baf9c0db279565a8d..f490aee467489dafc40acff92cec4d0317b9e74d 100755
--- a/ttool/runtime/config.xml
+++ b/ttool/runtime/config.xml
@@ -45,7 +45,7 @@
 <UPPAALVerifierPath data="/packages/uppaal-4.0.11/verifyta" />
 <UPPAALVerifierHost data="localhost" />
 <ProVerifCodeDirectory data="../proverif/" />
-<ProVerifVerifierPath data="/packages/proverif/proverif" />
+<ProVerifVerifierPath data="../../proverif" />
 <ProVerifVerifierHost data="localhost" />
 <AVATARExecutableCodeDirectory data="../executablecode/" />
 <AVATARMPSoCCodeDirectory data="../MPSoC/" />
@@ -65,7 +65,7 @@
 <ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal ../uppaal/spec.xml"/>
 
 
-<LastOpenFile data="/home/satan/TTool/modeling/AVATAR/CoffeeMachine_Avatar.ttool/CoffeeMachine_Avatar.xml"/>
+<LastOpenFile data="/home/satan/TTool/modeling/DIPLODOCUS/ZigBeeTutorial.ttool"/>