diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
index 45a73e8d20d086a89540933ae9a206e92026dd27..b9961d5c30d1a7b224d0281c6ac2da36c82a207c 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysML.java
@@ -500,7 +500,6 @@ public class AvatarFromSysML {
                  // create method
                 AvatarMethod am = new AvatarMethod(sm.getName(),null);
                  // add method
-                System.out.println("$$$$$$$$$$$ " + theBlock.getName() + " : " + am.getName());
                 theBlock.addMethod(am);
                 // add input parameters to method
                 buildProfile(sm, am, theBlock);
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
index 4d4a7e71f2948f28d05eb16049b2a2dfdd7a91ec..b88457eebaaea0a774f2bd19ee464b8abb1a059d 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 15/07/2024 15:37 */
+/* The following code was generated by JFlex 1.4.3 on 17/07/2024 17:44 */
 
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
  *
@@ -47,7 +47,7 @@ import avatartranslator.tosysmlv2.AvatarFromSysMLSyntax.*;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 15/07/2024 15:37 from the specification file
+ * on 17/07/2024 17:44 from the specification file
  * <code>__AvatarFromSysMLLexer__.jflex</code>
  */
 public class AvatarFromSysMLLexer implements java_cup.runtime.Scanner {
diff --git a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
index c1c48a4823892203202201094ced195064fcfef9..8c4e3e386f33aead958e3ce282f39862ff350a02 100644
--- a/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
+++ b/src/main/java/avatartranslator/tosysmlv2/AvatarFromSysMLParser.java
@@ -4544,11 +4544,13 @@ class CUP$AvatarFromSysMLParser$actions {
 		Location zxright = ((java_cup.runtime.ComplexSymbolFactory.ComplexSymbol)CUP$AvatarFromSysMLParser$stack.peek()).xright;
 		Object z = CUP$AvatarFromSysMLParser$stack.peek().<Object>value();
 		
+        System.out.println("$$$$$$$$$$$$$$$$$$$$$$$$ IF " + e);
         if (n != requestIndex + 1) {
                 addError( new AvatarFromSysMLError(AvatarFromSysMLError.LOWWARNING, nxleft,
                 " request index must be the request range in the request list (beginning at 1)", null) );
         }
         if (okRequest) {
+            theTransition.setGuard(e);
             theTransition.setRleft(ixleft);
             theTransition.setRright(zxright);
         }
diff --git a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
index 72e0e7af45d5a70656259eb2ece4d6ab40a9b8a9..0360b19f9dac0d007567358622fa41e5d410d319 100644
--- a/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
+++ b/src/main/java/avatartranslator/tosysmlv2/javacup/AvatarFromSysML.jcup
@@ -1574,6 +1574,7 @@ request ::=
                 " request index must be the request range in the request list (beginning at 1)", null) );
         }
         if (okRequest) {
+            theTransition.setGuard(e);
             theTransition.setRleft(ixleft);
             theTransition.setRright(zxright);
         }
diff --git a/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java b/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
index 03cf3b04e72084fe81187283fba0835663218651..00e8b4c409f9012f69619d9975d40512b625b4a6 100644
--- a/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
+++ b/ttool/src/test/java/cli/CLIAvatar2SysMLV2Test.java
@@ -87,7 +87,7 @@ public class CLIAvatar2SysMLV2Test extends AbstractTest implements InterpreterOu
 	    outputResult.append(s);
     }
 
-	//@Test
+	@Test
 	public void testOriginalModel() {
 	    String filePath = getBaseResourcesDir() + PATH_TO_TEST_FILE + "scriptavsysml";
 	    String script;
@@ -133,8 +133,8 @@ public class CLIAvatar2SysMLV2Test extends AbstractTest implements InterpreterOu
 
 
         System.out.println("states=" + oristates + ", " + tgtstates + " -- transitions=" + oritrans + ", " + tgttrans);
-        assertTrue(graph.getNbOfStates() == 14);
-        assertTrue(graph.getNbOfTransitions() == 16);
+        assertTrue(oristates == tgtstates);
+        assertTrue(oritrans == tgttrans);
 
 
         // Graph minimization