diff --git a/src/Main.java b/src/Main.java
index 5521649da407d167fbdb74ae3fb3ab0c04ec9b0b..e3bf0c2189f33ff4a17f8c53d0227119cf36cc9f 100755
--- a/src/Main.java
+++ b/src/Main.java
@@ -59,11 +59,11 @@ public class Main implements ActionListener {
     public boolean finish = false;
     public static Main main = new Main();
     public static boolean systemc = false;
-    public static boolean lotos = false;
+    public static boolean lotos = true;
     public static boolean proactive = false;
     public static boolean tpn = false;
     public static boolean os = false;
-    public static boolean uppaal = false;
+    public static boolean uppaal = true;
     public static boolean nc = true ; // Network calculus
     public static void main(String[] args) {
       
@@ -109,6 +109,10 @@ public class Main implements ActionListener {
             if (args[i].compareTo("-lotos") == 0) {
                 lotos = true;
                 System.out.println("LOTOS features activated");
+            }
+			if (args[i].compareTo("-nolotos") == 0) {
+                lotos = false;
+                System.out.println("LOTOS features activated");
             }
              if (args[i].compareTo("-launcher") == 0) {
                 Thread t = new Thread(new RTLLauncher());
@@ -143,6 +147,10 @@ public class Main implements ActionListener {
                 uppaal = true;
                 System.out.println("UPPAAL features activated - these are beta features that are meant to be used only for research purpose");
             }
+			 if (args[i].compareTo("-nouppaal") == 0) {
+                uppaal = false;
+                System.out.println("UPPAAL features activated - these are beta features that are meant to be used only for research purpose");
+            }
             
             if (args[i].compareTo("-config") == 0) {
                 config = args[Math.min(args.length-1, i+1)];