diff --git a/src/main/java/ui/ad/TADChoice.java b/src/main/java/ui/ad/TADChoice.java
index a0d289be4ea47c8da36c34cdad0a96eb5e6b6e11..32ef2cd2be6fd448e4b8a04c57ba9ad42ba207b3 100755
--- a/src/main/java/ui/ad/TADChoice.java
+++ b/src/main/java/ui/ad/TADChoice.java
@@ -74,41 +74,15 @@ public class TADChoice extends TADComponentWithSubcomponents/* Issue #69  TGCWit
     
     public TADChoice(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
         super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
-        
-        // Issue #31
+
         createConnectingPoints();
 
-//        width = 30;
-//        height = 30;
         initScaling( 30, 30 );
         
         nbInternalTGComponent = 3;
         tgcomponent = new TGComponent[nbInternalTGComponent];
         createGuards();
         
-//        dtextX1 = -lineOutLength;
-//        final int margin = scale( 5 );
-//        dtextY1 = height/2 - margin;
-//        dtextX2 = width + margin;
-//        dtextY2 = height/2 - margin;
-//        dtextX3 = width /2 + margin;
-//        dtextY3 = height + scale( 15 );
-        
-//        TGCOneLineText tgc = new TGCOneLineText(x+textX1-50, y+textY1, textX1-50, textX1+5, textY1, textY1 + 25, true, this, _tdp);
-//        tgc.setValue("[ ]");
-//        tgc.setName("guard 1");
-//        tgcomponent[0] = tgc;
-//        
-//        tgc = new TGCOneLineText(x+textX2, y+textY2, textX2, textX2+20, textY2, textY2+25, true, this, _tdp);
-//        tgc.setValue("[ ]");
-//        tgc.setName("guard 2");
-//        tgcomponent[1] = tgc;
-//        
-//        tgc = new TGCOneLineText(x+textX3, y+textY3, textX3, textX3+20, textY3, textY3+25, true, this, _tdp);
-//        tgc.setValue("[ ]");
-//        tgc.setName("guard 3");
-//        tgcomponent[2] = tgc;
-        
         moveable = true;
         editable = false;
         removable = true;
diff --git a/src/main/java/ui/avatarcd/AvatarCDAssociationConnectorArrow.java b/src/main/java/ui/avatarcd/AvatarCDAssociationConnectorArrow.java
index 9dc2c660b71fd746f1a4a972f068c68b1998005a..9b00a205cb004ee0fcca2f5285b8e3199275dbbd 100644
--- a/src/main/java/ui/avatarcd/AvatarCDAssociationConnectorArrow.java
+++ b/src/main/java/ui/avatarcd/AvatarCDAssociationConnectorArrow.java
@@ -40,6 +40,7 @@ package ui.avatarcd;
 
 import myutil.GraphicLib;
 import ui.*;
+import ui.avatarsmd.AvatarSMDTransitionInfo;
 import ui.util.IconManager;
 
 import java.awt.*;
@@ -62,7 +63,14 @@ public  class AvatarCDAssociationConnectorArrow extends TGConnectorWithMultiplic
        
         myImageIcon = IconManager.imgic202;
 
-        value = "{info}";
+        TGCOneLineText tgc = new TGCOneLineText((_p1.getX() + _p2.getX()) / 2, (_p1.getY() + _p2.getY()) / 2, tdp.getMinX(), tdp.getMaxX(),
+                tdp.getMinY(), tdp.getMaxY(), false, this, _tdp);
+        tgc.setValue("info");
+        tgc.setName("semantics");
+        tgc.setMoveWithFather(false);
+        addInternalComponent(tgc, getNbInternalTGComponent());
+
+        value = "";
         editable = true;
 //		oldScaleFactor = tdp.getZoom();
 //		rescaled = true;
diff --git a/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java b/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
index d853068b0717e63f7d2b60e9bd9f07c888783b77..38da91652ac5dff54a3c18939e361dc35814ddc5 100644
--- a/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
+++ b/ttool/src/test/java/tmltranslator/dsez3engine/InputInstanceTest.java
@@ -266,7 +266,7 @@ public class InputInstanceTest {
 
 
         Log.close();
-        
+
 
     }