diff --git a/src/main/java/tmltranslator/tmlcp/TMLSDInstance.java b/src/main/java/tmltranslator/tmlcp/TMLSDInstance.java
index 5f7b83c743c29ab6536867c43978730d7148f336..6db9e3185cb499c2447b1a032691b872a028cc5c 100755
--- a/src/main/java/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/main/java/tmltranslator/tmlcp/TMLSDInstance.java
@@ -45,8 +45,6 @@ package tmltranslator.tmlcp;
 import tmltranslator.TMLAttribute;
 import tmltranslator.TMLElement;
 import tmltranslator.TMLType;
-import ui.tmldd.TMLArchiNode;
-import ui.tmlsd.TGConnectorMessageTMLSD;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -61,7 +59,6 @@ import java.util.Collections;
 public class TMLSDInstance extends TMLElement  {
 
     private String type;
-    private TMLArchiNode mappedUnit;    //the unit of the architecture where the instance is mapped to
     private ArrayList<TMLAttribute> globalVariables;
     private ArrayList<TMLSDMessage> messages;
     private ArrayList<TMLSDAction> actions;
@@ -130,30 +127,22 @@ public class TMLSDInstance extends TMLElement  {
         events.add( new TMLSDEvent( _action, TMLSDEvent.ACTION_EVENT ) );
     }
 
-    public void addMappedUnit( TMLArchiNode _mappedUnit ) {
-        mappedUnit = _mappedUnit;
-    }
 
-    public TMLArchiNode getMappedUnit() {
-        return mappedUnit;
+    public void addSendMessage( TMLSDMessage _msg, int y) {
+        //TraceManager.addDev("SD: Adding message in " + getName()+ " nb of events: " + events.size());
+        messages.add( _msg );
+        events.add( new TMLSDEvent( _msg, TMLSDEvent.SEND_MESSAGE_EVENT, y ) );
+        Collections.sort( events );
     }
-
-    public void addMessage( TMLSDMessage _msg, int _type ) {
-
-			//TraceManager.addDev("SD: Adding message in " + getName()+ " nb of events: " + events.size());
-			messages.add( _msg );
-			if( _type == TMLSDEvent.SEND_MESSAGE_EVENT )	{
-				int yCoord = ( (TGConnectorMessageTMLSD) _msg.getReferenceObject()).getTGConnectingPointP1().getY();
-  	    events.add( new TMLSDEvent( _msg, TMLSDEvent.SEND_MESSAGE_EVENT, yCoord ) );
-			}
-			if( _type == TMLSDEvent.RECEIVE_MESSAGE_EVENT )	{
-	    	int yCoord = ( (TGConnectorMessageTMLSD) _msg.getReferenceObject()).getTGConnectingPointP2().getY();
-  	    events.add( new TMLSDEvent( _msg, TMLSDEvent.RECEIVE_MESSAGE_EVENT, yCoord ) );
-			}
-			Collections.sort( events );
+    public void addReceiveMessage( TMLSDMessage _msg, int y) {
+        //TraceManager.addDev("SD: Adding message in " + getName()+ " nb of events: " + events.size());
+        messages.add( _msg );
+        events.add( new TMLSDEvent( _msg, TMLSDEvent.RECEIVE_MESSAGE_EVENT, y ) );
+        Collections.sort( events );
     }
 
-		//Add a message from the parser where there is no notion of yCoord. Events are already ordered.
+
+    // Add a message from the parser where there is no notion of yCoord. Events are already ordered.
     public void addMessageFromParser( TMLSDMessage _msg, int _type ) {
 
 			messages.add( _msg );
diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java
index f2f206e3c311872219ba1b1fab5500dfb0df83bc..460b150484822db5f57e307e61e7a86e23c3a268 100644
--- a/src/main/java/ui/GTMLModeling.java
+++ b/src/main/java/ui/GTMLModeling.java
@@ -2645,12 +2645,15 @@ public class GTMLModeling {
                     for (tmltranslator.tmlcp.TMLSDInstance tempInstance : SD.getInstances()) {
                         if (tempInstance.getName().equals(sender)) {
                             //TraceManager.addDev( "Adding message " + message.toString() + " to instance " + tempInstance.toString() );
-                            tempInstance.addMessage(message, TMLSDEvent.SEND_MESSAGE_EVENT);
+                            tempInstance.addSendMessage(message,
+                                    ((TGConnectorMessageTMLSD)message.getReferenceObject()).
+                                            getTGConnectingPointP1().getY());
                             //break;
                         }
                         if (tempInstance.getName().equals(receiver)) {
                             //TraceManager.addDev( "Adding message " + message.toString() + " to instance " + tempInstance.toString() );
-                            tempInstance.addMessage(message, TMLSDEvent.RECEIVE_MESSAGE_EVENT);
+                            tempInstance.addReceiveMessage(message, ((TGConnectorMessageTMLSD)message.getReferenceObject()).
+                                    getTGConnectingPointP2().getY());
                             //break;
                         }
                     }