diff --git a/build.txt b/build.txt
index 2d26731f028a20dec67395bd20b5855a9f888fa3..a6b33c209e04909515041740c140f5429f0d3744 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-13423
\ No newline at end of file
+13433
\ No newline at end of file
diff --git a/graphminimize/build.gradle b/graphminimize/build.gradle
index 7400c4310a2248e06555529eb9e45781ca0abbe0..bd673b273522b83f4f2d41f1a79a521dd6f039fe 100644
--- a/graphminimize/build.gradle
+++ b/graphminimize/build.gradle
@@ -27,6 +27,7 @@ dependencies {
     compileOnly name: 'jsoup-1.8.1'
     compile name: 'jautomata-core'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/graphminimize/manifest.txt b/graphminimize/manifest.txt
index 4d9391cdb6346df80dfc8bc2b6c48e44211a5c0b..5dac3c3fdabc33c2166447bb6e873326194185c0 100755
--- a/graphminimize/manifest.txt
+++ b/graphminimize/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: GraphShow
-Class-Path: ./gs-core-1.3.jar ./gs-ui-1.3.jar
+Class-Path: ./gs-core-1.3.jar ./gs-ui-1.3.jar ./commons-math3-3.6.1.jar
diff --git a/graphshow/build.gradle b/graphshow/build.gradle
index 684dcb5c09e3f28225738dc7091ca8155179e44d..131b304ad473edf9830f8a50b64e240fdc62b2de 100644
--- a/graphshow/build.gradle
+++ b/graphshow/build.gradle
@@ -22,6 +22,7 @@ dependencies {
     compileOnly name: 'jsoup-1.8.1'
     compile name: 'jautomata-core'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/graphshow/manifest.txt b/graphshow/manifest.txt
index 5d3a6528d3c2ebb71b4c852f64c2318ea49d432a..5dac3c3fdabc33c2166447bb6e873326194185c0 100755
--- a/graphshow/manifest.txt
+++ b/graphshow/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: GraphShow
-Class-Path: ./gs-core-1.3.jar ./gs-ui-1.3.jar 
+Class-Path: ./gs-core-1.3.jar ./gs-ui-1.3.jar ./commons-math3-3.6.1.jar
diff --git a/launcher/build.gradle b/launcher/build.gradle
index c1d37cf0ca2121ea87bc4aba2c4a4e8153e517f2..f153a874faa3f8ef215a57b43f51d0724708eda8 100644
--- a/launcher/build.gradle
+++ b/launcher/build.gradle
@@ -16,6 +16,7 @@ dependencies {
     compileOnly name: 'commons-io-2.5'
     compileOnly name: 'jsoup-1.8.1'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/launcher/manifest.txt b/launcher/manifest.txt
index 6c63af2a254b88fede497ed4ac1ab91875ed96dc..1657cba99e65d0e5c9d39645e0b2562b27220a7f 100755
--- a/launcher/manifest.txt
+++ b/launcher/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: launcher.Main
-Class-Path: ./commons-codec-1.10.jar
+Class-Path: ./commons-codec-1.10.jar ./commons-math3-3.6.1.jar
diff --git a/modeling/AVATAR/AirbusDoor_V2.xml b/modeling/AVATAR/AirbusDoor_V2.xml
index 105ae752dcc5e16b885662a3468720244d8c74b0..b443ef18d6f0c42a96ab5bec6c44e07e31dab929 100644
--- a/modeling/AVATAR/AirbusDoor_V2.xml
+++ b/modeling/AVATAR/AirbusDoor_V2.xml
@@ -876,6 +876,7 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
+<considerTimingOperators value="true" />
 <Validated value="" />
 <Ignored value="" />
 
@@ -892,7 +893,7 @@
 <isd value="in stopBuzzer()" />
 <oso value="out startBuzzer3sec()" />
 <oso value="out endBuzzer3sec()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="573" >
@@ -908,7 +909,7 @@
 <isd value="in emergencyCode()" />
 <oso value="out call()" />
 <oso value="out emergencyCall()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="575" >
@@ -926,7 +927,7 @@
 <osd value="out redLight()" />
 <osd value="out greenLight()" />
 <osd value="out noLight()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="577" >
@@ -944,7 +945,7 @@
 <oso value="out openFromCockpit()" />
 <oso value="out openFromCabin()" />
 <oso value="out close(int nbOfPersonsInside, int nbOfPersonsOutside, int nbOfPilotOutside, int nbOfCrewOutside)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="579" >
@@ -964,7 +965,7 @@
 <oso value="out lock()" />
 <oso value="out unlock()" />
 <oso value="out norm()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="581" >
@@ -988,7 +989,7 @@
 <osd value="out cabinCrewEnteringCockpit()" />
 <osd value="out passengerLeavingCockpit()" />
 <osd value="out passengerEnteringCockpit()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="583" >
@@ -1000,7 +1001,7 @@
 <P2  x="1237" y="935" id="708" />
 <AutomaticDrawing  data="true" />
 <extraparam>
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="585" >
@@ -1020,7 +1021,7 @@
 <osd value="out open()" />
 <osd value="out stopFault()" />
 <osd value="out stopOpen()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="587" >
@@ -1034,7 +1035,7 @@
 <extraparam>
 <isd value="in readNbOfPilots(int nb)" />
 <oso value="out obs_nbOfPilotsIncockpit(int nbOfPilotsInCockpit)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="589" >
@@ -1048,7 +1049,7 @@
 <extraparam>
 <isd value="in readNbOfPassengersInCockpit(int passengersInCokpit)" />
 <oso value="out obs_nbOfPassengersIncockpit(int nbOfPassengersInCockpit)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="591" >
@@ -1064,7 +1065,7 @@
 <iso value="in AtLeastTwoPersonsInTheCockpitViolated(int nbOfPersonsInCockpit)" />
 <osd value="out obs_AtLeastOntPilotInTheCockpit(int nbOfPilots)" />
 <osd value="out obs_AtLeastTwoPersonsInTheCockpit(int nbOfPersonsInCockpit)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="593" >
@@ -1078,7 +1079,7 @@
 <extraparam>
 <iso value="in getNbOfPilotsInCabin(int nbOfPilotsInCabin)" />
 <osd value="out obs_nbOfPilotsInCabin(int nbOfPilotsInCabin)" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <CONNECTOR type="5002" id="595" >
@@ -1094,7 +1095,7 @@
 <isd value="in stopAlarm()" />
 <oso value="out startAlarm()" />
 <oso value="out stopAlarm()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <COMPONENT type="5000" id="620" >
@@ -1718,6 +1719,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1748,6 +1751,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1778,6 +1783,8 @@
 <guard value="[ pilotsInCabin == value]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1809,6 +1816,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1871,6 +1880,8 @@
 <guard value="[ pilotsInCabin == 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1901,6 +1912,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1931,6 +1944,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1961,6 +1976,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -1991,6 +2008,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2021,6 +2040,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2547,6 +2568,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2577,6 +2600,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2607,6 +2632,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2637,6 +2664,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2667,6 +2696,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2697,6 +2728,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2727,6 +2760,8 @@
 <guard value="[ nb &lt; 2]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2758,6 +2793,8 @@
 <guard value="[ nb &lt; 1]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2789,6 +2826,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2819,6 +2858,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2849,6 +2890,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3430,6 +3473,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3460,6 +3505,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3490,6 +3537,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3550,6 +3599,8 @@
 <guard value="[ passengersInCockpit &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3580,6 +3631,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3892,6 +3945,8 @@
 <guard value="[ else ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3952,6 +4007,8 @@
 <guard value="[ pilotsInCockpit &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3982,6 +4039,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4012,6 +4071,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4042,6 +4103,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4354,6 +4417,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4385,6 +4450,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4415,6 +4482,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4446,6 +4515,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4476,6 +4547,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4507,6 +4580,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4537,6 +4612,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4568,6 +4645,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4579,8 +4658,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="2555" />
-<P1  x="787" y="437" id="2960" />
-<P2  x="658" y="595" id="2858" />
+<P1  x="787" y="437" id="2666" />
+<P2  x="658" y="595" id="2714" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2554" >
 <father id="2556" num="0" />
@@ -4598,6 +4677,8 @@
 <guard value="[ (fault == true)&amp;&amp; (open == true)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4609,8 +4690,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="2562" />
-<P1  x="837" y="437" id="2962" />
-<P2  x="892" y="587" id="2801" />
+<P1  x="837" y="437" id="2668" />
+<P2  x="892" y="587" id="2803" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2561" >
 <father id="2563" num="0" />
@@ -4628,6 +4709,8 @@
 <guard value="[(fault == false)&amp;&amp; (open == true)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4639,8 +4722,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="2569" />
-<P1  x="875" y="424" id="2945" />
-<P2  x="988" y="469" id="2712" />
+<P1  x="875" y="424" id="2651" />
+<P2  x="988" y="469" id="2860" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2568" >
 <father id="2570" num="0" />
@@ -4658,6 +4741,8 @@
 <guard value="[ (fault == true)&amp;&amp; (open == false)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4669,8 +4754,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="2576" />
-<P1  x="775" y="412" id="2935" />
-<P2  x="618" y="455" id="2639" />
+<P1  x="775" y="412" id="2641" />
+<P2  x="618" y="455" id="2933" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2575" >
 <father id="2577" num="0" />
@@ -4688,6 +4773,8 @@
 <guard value="[ (fault == false)&amp;&amp; (open == false)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4699,8 +4786,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="2583" />
-<P1  x="836" y="345" id="2930" />
-<P2  x="825" y="387" id="2933" />
+<P1  x="836" y="345" id="2711" />
+<P2  x="825" y="387" id="2639" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2582" >
 <father id="2584" num="0" />
@@ -4718,6 +4805,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4748,6 +4837,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -4923,12 +5014,12 @@
 </COMPONENT>
 <SUBCOMPONENT type="5106" id="2710" >
 <father id="3077" num="0" />
-<cdparam x="568" y="455" />
+<cdparam x="775" y="387" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
-<infoparam name="state0" value="IDLE" />
+<infoparam name="state0" value="Test" />
 <TGConnectingPoint num="0" id="2638" />
 <TGConnectingPoint num="1" id="2639" />
 <TGConnectingPoint num="2" id="2640" />
@@ -5004,272 +5095,272 @@
 <extraparam>
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2783" >
+<SUBCOMPONENT type="5100" id="2712" >
 <father id="3077" num="1" />
-<cdparam x="938" y="469" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="829" y="325" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
-<infoparam name="state0" value="FAULT" />
+<cdrectangleparam minX="0" maxX="626" minY="0" maxY="426" />
+<infoparam name="start state" value="null" />
 <TGConnectingPoint num="0" id="2711" />
-<TGConnectingPoint num="1" id="2712" />
-<TGConnectingPoint num="2" id="2713" />
-<TGConnectingPoint num="3" id="2714" />
-<TGConnectingPoint num="4" id="2715" />
-<TGConnectingPoint num="5" id="2716" />
-<TGConnectingPoint num="6" id="2717" />
-<TGConnectingPoint num="7" id="2718" />
-<TGConnectingPoint num="8" id="2719" />
-<TGConnectingPoint num="9" id="2720" />
-<TGConnectingPoint num="10" id="2721" />
-<TGConnectingPoint num="11" id="2722" />
-<TGConnectingPoint num="12" id="2723" />
-<TGConnectingPoint num="13" id="2724" />
-<TGConnectingPoint num="14" id="2725" />
-<TGConnectingPoint num="15" id="2726" />
-<TGConnectingPoint num="16" id="2727" />
-<TGConnectingPoint num="17" id="2728" />
-<TGConnectingPoint num="18" id="2729" />
-<TGConnectingPoint num="19" id="2730" />
-<TGConnectingPoint num="20" id="2731" />
-<TGConnectingPoint num="21" id="2732" />
-<TGConnectingPoint num="22" id="2733" />
-<TGConnectingPoint num="23" id="2734" />
-<TGConnectingPoint num="24" id="2735" />
-<TGConnectingPoint num="25" id="2736" />
-<TGConnectingPoint num="26" id="2737" />
-<TGConnectingPoint num="27" id="2738" />
-<TGConnectingPoint num="28" id="2739" />
-<TGConnectingPoint num="29" id="2740" />
-<TGConnectingPoint num="30" id="2741" />
-<TGConnectingPoint num="31" id="2742" />
-<TGConnectingPoint num="32" id="2743" />
-<TGConnectingPoint num="33" id="2744" />
-<TGConnectingPoint num="34" id="2745" />
-<TGConnectingPoint num="35" id="2746" />
-<TGConnectingPoint num="36" id="2747" />
-<TGConnectingPoint num="37" id="2748" />
-<TGConnectingPoint num="38" id="2749" />
-<TGConnectingPoint num="39" id="2750" />
-<TGConnectingPoint num="40" id="2751" />
-<TGConnectingPoint num="41" id="2752" />
-<TGConnectingPoint num="42" id="2753" />
-<TGConnectingPoint num="43" id="2754" />
-<TGConnectingPoint num="44" id="2755" />
-<TGConnectingPoint num="45" id="2756" />
-<TGConnectingPoint num="46" id="2757" />
-<TGConnectingPoint num="47" id="2758" />
-<TGConnectingPoint num="48" id="2759" />
-<TGConnectingPoint num="49" id="2760" />
-<TGConnectingPoint num="50" id="2761" />
-<TGConnectingPoint num="51" id="2762" />
-<TGConnectingPoint num="52" id="2763" />
-<TGConnectingPoint num="53" id="2764" />
-<TGConnectingPoint num="54" id="2765" />
-<TGConnectingPoint num="55" id="2766" />
-<TGConnectingPoint num="56" id="2767" />
-<TGConnectingPoint num="57" id="2768" />
-<TGConnectingPoint num="58" id="2769" />
-<TGConnectingPoint num="59" id="2770" />
-<TGConnectingPoint num="60" id="2771" />
-<TGConnectingPoint num="61" id="2772" />
-<TGConnectingPoint num="62" id="2773" />
-<TGConnectingPoint num="63" id="2774" />
-<TGConnectingPoint num="64" id="2775" />
-<TGConnectingPoint num="65" id="2776" />
-<TGConnectingPoint num="66" id="2777" />
-<TGConnectingPoint num="67" id="2778" />
-<TGConnectingPoint num="68" id="2779" />
-<TGConnectingPoint num="69" id="2780" />
-<TGConnectingPoint num="70" id="2781" />
-<TGConnectingPoint num="71" id="2782" />
-<extraparam>
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2856" >
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="2785" >
 <father id="3077" num="2" />
-<cdparam x="855" y="587" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
-<infoparam name="state0" value="OPEN" />
-<TGConnectingPoint num="0" id="2784" />
-<TGConnectingPoint num="1" id="2785" />
-<TGConnectingPoint num="2" id="2786" />
-<TGConnectingPoint num="3" id="2787" />
-<TGConnectingPoint num="4" id="2788" />
-<TGConnectingPoint num="5" id="2789" />
-<TGConnectingPoint num="6" id="2790" />
-<TGConnectingPoint num="7" id="2791" />
-<TGConnectingPoint num="8" id="2792" />
-<TGConnectingPoint num="9" id="2793" />
-<TGConnectingPoint num="10" id="2794" />
-<TGConnectingPoint num="11" id="2795" />
-<TGConnectingPoint num="12" id="2796" />
-<TGConnectingPoint num="13" id="2797" />
-<TGConnectingPoint num="14" id="2798" />
-<TGConnectingPoint num="15" id="2799" />
-<TGConnectingPoint num="16" id="2800" />
-<TGConnectingPoint num="17" id="2801" />
-<TGConnectingPoint num="18" id="2802" />
-<TGConnectingPoint num="19" id="2803" />
-<TGConnectingPoint num="20" id="2804" />
-<TGConnectingPoint num="21" id="2805" />
-<TGConnectingPoint num="22" id="2806" />
-<TGConnectingPoint num="23" id="2807" />
-<TGConnectingPoint num="24" id="2808" />
-<TGConnectingPoint num="25" id="2809" />
-<TGConnectingPoint num="26" id="2810" />
-<TGConnectingPoint num="27" id="2811" />
-<TGConnectingPoint num="28" id="2812" />
-<TGConnectingPoint num="29" id="2813" />
-<TGConnectingPoint num="30" id="2814" />
-<TGConnectingPoint num="31" id="2815" />
-<TGConnectingPoint num="32" id="2816" />
-<TGConnectingPoint num="33" id="2817" />
-<TGConnectingPoint num="34" id="2818" />
-<TGConnectingPoint num="35" id="2819" />
-<TGConnectingPoint num="36" id="2820" />
-<TGConnectingPoint num="37" id="2821" />
-<TGConnectingPoint num="38" id="2822" />
-<TGConnectingPoint num="39" id="2823" />
-<TGConnectingPoint num="40" id="2824" />
-<TGConnectingPoint num="41" id="2825" />
-<TGConnectingPoint num="42" id="2826" />
-<TGConnectingPoint num="43" id="2827" />
-<TGConnectingPoint num="44" id="2828" />
-<TGConnectingPoint num="45" id="2829" />
-<TGConnectingPoint num="46" id="2830" />
-<TGConnectingPoint num="47" id="2831" />
-<TGConnectingPoint num="48" id="2832" />
-<TGConnectingPoint num="49" id="2833" />
-<TGConnectingPoint num="50" id="2834" />
-<TGConnectingPoint num="51" id="2835" />
-<TGConnectingPoint num="52" id="2836" />
-<TGConnectingPoint num="53" id="2837" />
-<TGConnectingPoint num="54" id="2838" />
-<TGConnectingPoint num="55" id="2839" />
-<TGConnectingPoint num="56" id="2840" />
-<TGConnectingPoint num="57" id="2841" />
-<TGConnectingPoint num="58" id="2842" />
-<TGConnectingPoint num="59" id="2843" />
-<TGConnectingPoint num="60" id="2844" />
-<TGConnectingPoint num="61" id="2845" />
-<TGConnectingPoint num="62" id="2846" />
-<TGConnectingPoint num="63" id="2847" />
-<TGConnectingPoint num="64" id="2848" />
-<TGConnectingPoint num="65" id="2849" />
-<TGConnectingPoint num="66" id="2850" />
-<TGConnectingPoint num="67" id="2851" />
-<TGConnectingPoint num="68" id="2852" />
-<TGConnectingPoint num="69" id="2853" />
-<TGConnectingPoint num="70" id="2854" />
-<TGConnectingPoint num="71" id="2855" />
-<extraparam>
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2929" >
-<father id="3077" num="3" />
 <cdparam x="559" y="595" />
 <sizeparam width="198" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="443" minY="0" maxY="391" />
 <infoparam name="state0" value="FAULT_AND_OPEN" />
-<TGConnectingPoint num="0" id="2857" />
-<TGConnectingPoint num="1" id="2858" />
-<TGConnectingPoint num="2" id="2859" />
-<TGConnectingPoint num="3" id="2860" />
-<TGConnectingPoint num="4" id="2861" />
-<TGConnectingPoint num="5" id="2862" />
-<TGConnectingPoint num="6" id="2863" />
-<TGConnectingPoint num="7" id="2864" />
-<TGConnectingPoint num="8" id="2865" />
-<TGConnectingPoint num="9" id="2866" />
-<TGConnectingPoint num="10" id="2867" />
-<TGConnectingPoint num="11" id="2868" />
-<TGConnectingPoint num="12" id="2869" />
-<TGConnectingPoint num="13" id="2870" />
-<TGConnectingPoint num="14" id="2871" />
-<TGConnectingPoint num="15" id="2872" />
-<TGConnectingPoint num="16" id="2873" />
-<TGConnectingPoint num="17" id="2874" />
-<TGConnectingPoint num="18" id="2875" />
-<TGConnectingPoint num="19" id="2876" />
-<TGConnectingPoint num="20" id="2877" />
-<TGConnectingPoint num="21" id="2878" />
-<TGConnectingPoint num="22" id="2879" />
-<TGConnectingPoint num="23" id="2880" />
-<TGConnectingPoint num="24" id="2881" />
-<TGConnectingPoint num="25" id="2882" />
-<TGConnectingPoint num="26" id="2883" />
-<TGConnectingPoint num="27" id="2884" />
-<TGConnectingPoint num="28" id="2885" />
-<TGConnectingPoint num="29" id="2886" />
-<TGConnectingPoint num="30" id="2887" />
-<TGConnectingPoint num="31" id="2888" />
-<TGConnectingPoint num="32" id="2889" />
-<TGConnectingPoint num="33" id="2890" />
-<TGConnectingPoint num="34" id="2891" />
-<TGConnectingPoint num="35" id="2892" />
-<TGConnectingPoint num="36" id="2893" />
-<TGConnectingPoint num="37" id="2894" />
-<TGConnectingPoint num="38" id="2895" />
-<TGConnectingPoint num="39" id="2896" />
-<TGConnectingPoint num="40" id="2897" />
-<TGConnectingPoint num="41" id="2898" />
-<TGConnectingPoint num="42" id="2899" />
-<TGConnectingPoint num="43" id="2900" />
-<TGConnectingPoint num="44" id="2901" />
-<TGConnectingPoint num="45" id="2902" />
-<TGConnectingPoint num="46" id="2903" />
-<TGConnectingPoint num="47" id="2904" />
-<TGConnectingPoint num="48" id="2905" />
-<TGConnectingPoint num="49" id="2906" />
-<TGConnectingPoint num="50" id="2907" />
-<TGConnectingPoint num="51" id="2908" />
-<TGConnectingPoint num="52" id="2909" />
-<TGConnectingPoint num="53" id="2910" />
-<TGConnectingPoint num="54" id="2911" />
-<TGConnectingPoint num="55" id="2912" />
-<TGConnectingPoint num="56" id="2913" />
-<TGConnectingPoint num="57" id="2914" />
-<TGConnectingPoint num="58" id="2915" />
-<TGConnectingPoint num="59" id="2916" />
-<TGConnectingPoint num="60" id="2917" />
-<TGConnectingPoint num="61" id="2918" />
-<TGConnectingPoint num="62" id="2919" />
-<TGConnectingPoint num="63" id="2920" />
-<TGConnectingPoint num="64" id="2921" />
-<TGConnectingPoint num="65" id="2922" />
-<TGConnectingPoint num="66" id="2923" />
-<TGConnectingPoint num="67" id="2924" />
-<TGConnectingPoint num="68" id="2925" />
-<TGConnectingPoint num="69" id="2926" />
-<TGConnectingPoint num="70" id="2927" />
-<TGConnectingPoint num="71" id="2928" />
-<extraparam>
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="2931" >
+<TGConnectingPoint num="0" id="2713" />
+<TGConnectingPoint num="1" id="2714" />
+<TGConnectingPoint num="2" id="2715" />
+<TGConnectingPoint num="3" id="2716" />
+<TGConnectingPoint num="4" id="2717" />
+<TGConnectingPoint num="5" id="2718" />
+<TGConnectingPoint num="6" id="2719" />
+<TGConnectingPoint num="7" id="2720" />
+<TGConnectingPoint num="8" id="2721" />
+<TGConnectingPoint num="9" id="2722" />
+<TGConnectingPoint num="10" id="2723" />
+<TGConnectingPoint num="11" id="2724" />
+<TGConnectingPoint num="12" id="2725" />
+<TGConnectingPoint num="13" id="2726" />
+<TGConnectingPoint num="14" id="2727" />
+<TGConnectingPoint num="15" id="2728" />
+<TGConnectingPoint num="16" id="2729" />
+<TGConnectingPoint num="17" id="2730" />
+<TGConnectingPoint num="18" id="2731" />
+<TGConnectingPoint num="19" id="2732" />
+<TGConnectingPoint num="20" id="2733" />
+<TGConnectingPoint num="21" id="2734" />
+<TGConnectingPoint num="22" id="2735" />
+<TGConnectingPoint num="23" id="2736" />
+<TGConnectingPoint num="24" id="2737" />
+<TGConnectingPoint num="25" id="2738" />
+<TGConnectingPoint num="26" id="2739" />
+<TGConnectingPoint num="27" id="2740" />
+<TGConnectingPoint num="28" id="2741" />
+<TGConnectingPoint num="29" id="2742" />
+<TGConnectingPoint num="30" id="2743" />
+<TGConnectingPoint num="31" id="2744" />
+<TGConnectingPoint num="32" id="2745" />
+<TGConnectingPoint num="33" id="2746" />
+<TGConnectingPoint num="34" id="2747" />
+<TGConnectingPoint num="35" id="2748" />
+<TGConnectingPoint num="36" id="2749" />
+<TGConnectingPoint num="37" id="2750" />
+<TGConnectingPoint num="38" id="2751" />
+<TGConnectingPoint num="39" id="2752" />
+<TGConnectingPoint num="40" id="2753" />
+<TGConnectingPoint num="41" id="2754" />
+<TGConnectingPoint num="42" id="2755" />
+<TGConnectingPoint num="43" id="2756" />
+<TGConnectingPoint num="44" id="2757" />
+<TGConnectingPoint num="45" id="2758" />
+<TGConnectingPoint num="46" id="2759" />
+<TGConnectingPoint num="47" id="2760" />
+<TGConnectingPoint num="48" id="2761" />
+<TGConnectingPoint num="49" id="2762" />
+<TGConnectingPoint num="50" id="2763" />
+<TGConnectingPoint num="51" id="2764" />
+<TGConnectingPoint num="52" id="2765" />
+<TGConnectingPoint num="53" id="2766" />
+<TGConnectingPoint num="54" id="2767" />
+<TGConnectingPoint num="55" id="2768" />
+<TGConnectingPoint num="56" id="2769" />
+<TGConnectingPoint num="57" id="2770" />
+<TGConnectingPoint num="58" id="2771" />
+<TGConnectingPoint num="59" id="2772" />
+<TGConnectingPoint num="60" id="2773" />
+<TGConnectingPoint num="61" id="2774" />
+<TGConnectingPoint num="62" id="2775" />
+<TGConnectingPoint num="63" id="2776" />
+<TGConnectingPoint num="64" id="2777" />
+<TGConnectingPoint num="65" id="2778" />
+<TGConnectingPoint num="66" id="2779" />
+<TGConnectingPoint num="67" id="2780" />
+<TGConnectingPoint num="68" id="2781" />
+<TGConnectingPoint num="69" id="2782" />
+<TGConnectingPoint num="70" id="2783" />
+<TGConnectingPoint num="71" id="2784" />
+<extraparam>
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="2858" >
+<father id="3077" num="3" />
+<cdparam x="855" y="587" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
+<infoparam name="state0" value="OPEN" />
+<TGConnectingPoint num="0" id="2786" />
+<TGConnectingPoint num="1" id="2787" />
+<TGConnectingPoint num="2" id="2788" />
+<TGConnectingPoint num="3" id="2789" />
+<TGConnectingPoint num="4" id="2790" />
+<TGConnectingPoint num="5" id="2791" />
+<TGConnectingPoint num="6" id="2792" />
+<TGConnectingPoint num="7" id="2793" />
+<TGConnectingPoint num="8" id="2794" />
+<TGConnectingPoint num="9" id="2795" />
+<TGConnectingPoint num="10" id="2796" />
+<TGConnectingPoint num="11" id="2797" />
+<TGConnectingPoint num="12" id="2798" />
+<TGConnectingPoint num="13" id="2799" />
+<TGConnectingPoint num="14" id="2800" />
+<TGConnectingPoint num="15" id="2801" />
+<TGConnectingPoint num="16" id="2802" />
+<TGConnectingPoint num="17" id="2803" />
+<TGConnectingPoint num="18" id="2804" />
+<TGConnectingPoint num="19" id="2805" />
+<TGConnectingPoint num="20" id="2806" />
+<TGConnectingPoint num="21" id="2807" />
+<TGConnectingPoint num="22" id="2808" />
+<TGConnectingPoint num="23" id="2809" />
+<TGConnectingPoint num="24" id="2810" />
+<TGConnectingPoint num="25" id="2811" />
+<TGConnectingPoint num="26" id="2812" />
+<TGConnectingPoint num="27" id="2813" />
+<TGConnectingPoint num="28" id="2814" />
+<TGConnectingPoint num="29" id="2815" />
+<TGConnectingPoint num="30" id="2816" />
+<TGConnectingPoint num="31" id="2817" />
+<TGConnectingPoint num="32" id="2818" />
+<TGConnectingPoint num="33" id="2819" />
+<TGConnectingPoint num="34" id="2820" />
+<TGConnectingPoint num="35" id="2821" />
+<TGConnectingPoint num="36" id="2822" />
+<TGConnectingPoint num="37" id="2823" />
+<TGConnectingPoint num="38" id="2824" />
+<TGConnectingPoint num="39" id="2825" />
+<TGConnectingPoint num="40" id="2826" />
+<TGConnectingPoint num="41" id="2827" />
+<TGConnectingPoint num="42" id="2828" />
+<TGConnectingPoint num="43" id="2829" />
+<TGConnectingPoint num="44" id="2830" />
+<TGConnectingPoint num="45" id="2831" />
+<TGConnectingPoint num="46" id="2832" />
+<TGConnectingPoint num="47" id="2833" />
+<TGConnectingPoint num="48" id="2834" />
+<TGConnectingPoint num="49" id="2835" />
+<TGConnectingPoint num="50" id="2836" />
+<TGConnectingPoint num="51" id="2837" />
+<TGConnectingPoint num="52" id="2838" />
+<TGConnectingPoint num="53" id="2839" />
+<TGConnectingPoint num="54" id="2840" />
+<TGConnectingPoint num="55" id="2841" />
+<TGConnectingPoint num="56" id="2842" />
+<TGConnectingPoint num="57" id="2843" />
+<TGConnectingPoint num="58" id="2844" />
+<TGConnectingPoint num="59" id="2845" />
+<TGConnectingPoint num="60" id="2846" />
+<TGConnectingPoint num="61" id="2847" />
+<TGConnectingPoint num="62" id="2848" />
+<TGConnectingPoint num="63" id="2849" />
+<TGConnectingPoint num="64" id="2850" />
+<TGConnectingPoint num="65" id="2851" />
+<TGConnectingPoint num="66" id="2852" />
+<TGConnectingPoint num="67" id="2853" />
+<TGConnectingPoint num="68" id="2854" />
+<TGConnectingPoint num="69" id="2855" />
+<TGConnectingPoint num="70" id="2856" />
+<TGConnectingPoint num="71" id="2857" />
+<extraparam>
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5106" id="2931" >
 <father id="3077" num="4" />
-<cdparam x="829" y="325" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="938" y="469" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="626" minY="0" maxY="426" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2930" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
+<infoparam name="state0" value="FAULT" />
+<TGConnectingPoint num="0" id="2859" />
+<TGConnectingPoint num="1" id="2860" />
+<TGConnectingPoint num="2" id="2861" />
+<TGConnectingPoint num="3" id="2862" />
+<TGConnectingPoint num="4" id="2863" />
+<TGConnectingPoint num="5" id="2864" />
+<TGConnectingPoint num="6" id="2865" />
+<TGConnectingPoint num="7" id="2866" />
+<TGConnectingPoint num="8" id="2867" />
+<TGConnectingPoint num="9" id="2868" />
+<TGConnectingPoint num="10" id="2869" />
+<TGConnectingPoint num="11" id="2870" />
+<TGConnectingPoint num="12" id="2871" />
+<TGConnectingPoint num="13" id="2872" />
+<TGConnectingPoint num="14" id="2873" />
+<TGConnectingPoint num="15" id="2874" />
+<TGConnectingPoint num="16" id="2875" />
+<TGConnectingPoint num="17" id="2876" />
+<TGConnectingPoint num="18" id="2877" />
+<TGConnectingPoint num="19" id="2878" />
+<TGConnectingPoint num="20" id="2879" />
+<TGConnectingPoint num="21" id="2880" />
+<TGConnectingPoint num="22" id="2881" />
+<TGConnectingPoint num="23" id="2882" />
+<TGConnectingPoint num="24" id="2883" />
+<TGConnectingPoint num="25" id="2884" />
+<TGConnectingPoint num="26" id="2885" />
+<TGConnectingPoint num="27" id="2886" />
+<TGConnectingPoint num="28" id="2887" />
+<TGConnectingPoint num="29" id="2888" />
+<TGConnectingPoint num="30" id="2889" />
+<TGConnectingPoint num="31" id="2890" />
+<TGConnectingPoint num="32" id="2891" />
+<TGConnectingPoint num="33" id="2892" />
+<TGConnectingPoint num="34" id="2893" />
+<TGConnectingPoint num="35" id="2894" />
+<TGConnectingPoint num="36" id="2895" />
+<TGConnectingPoint num="37" id="2896" />
+<TGConnectingPoint num="38" id="2897" />
+<TGConnectingPoint num="39" id="2898" />
+<TGConnectingPoint num="40" id="2899" />
+<TGConnectingPoint num="41" id="2900" />
+<TGConnectingPoint num="42" id="2901" />
+<TGConnectingPoint num="43" id="2902" />
+<TGConnectingPoint num="44" id="2903" />
+<TGConnectingPoint num="45" id="2904" />
+<TGConnectingPoint num="46" id="2905" />
+<TGConnectingPoint num="47" id="2906" />
+<TGConnectingPoint num="48" id="2907" />
+<TGConnectingPoint num="49" id="2908" />
+<TGConnectingPoint num="50" id="2909" />
+<TGConnectingPoint num="51" id="2910" />
+<TGConnectingPoint num="52" id="2911" />
+<TGConnectingPoint num="53" id="2912" />
+<TGConnectingPoint num="54" id="2913" />
+<TGConnectingPoint num="55" id="2914" />
+<TGConnectingPoint num="56" id="2915" />
+<TGConnectingPoint num="57" id="2916" />
+<TGConnectingPoint num="58" id="2917" />
+<TGConnectingPoint num="59" id="2918" />
+<TGConnectingPoint num="60" id="2919" />
+<TGConnectingPoint num="61" id="2920" />
+<TGConnectingPoint num="62" id="2921" />
+<TGConnectingPoint num="63" id="2922" />
+<TGConnectingPoint num="64" id="2923" />
+<TGConnectingPoint num="65" id="2924" />
+<TGConnectingPoint num="66" id="2925" />
+<TGConnectingPoint num="67" id="2926" />
+<TGConnectingPoint num="68" id="2927" />
+<TGConnectingPoint num="69" id="2928" />
+<TGConnectingPoint num="70" id="2929" />
+<TGConnectingPoint num="71" id="2930" />
+<extraparam>
+</extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5106" id="3004" >
 <father id="3077" num="5" />
-<cdparam x="775" y="387" />
+<cdparam x="568" y="455" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="541" minY="0" maxY="391" />
-<infoparam name="state0" value="Test" />
+<infoparam name="state0" value="IDLE" />
 <TGConnectingPoint num="0" id="2932" />
 <TGConnectingPoint num="1" id="2933" />
 <TGConnectingPoint num="2" id="2934" />
@@ -5404,6 +5495,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5434,6 +5527,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5494,6 +5589,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5524,6 +5621,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5554,6 +5653,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5738,6 +5839,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5768,6 +5871,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5808,6 +5913,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5838,6 +5945,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5868,6 +5977,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5908,6 +6019,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5938,6 +6051,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5968,6 +6083,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -5998,6 +6115,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6028,6 +6147,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6058,6 +6179,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6088,6 +6211,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6118,6 +6243,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6148,6 +6275,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6178,6 +6307,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6208,6 +6339,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6238,6 +6371,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6268,6 +6403,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6298,6 +6435,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6761,6 +6900,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6791,6 +6932,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6821,6 +6964,8 @@
 <guard value="[ (emergency == true) &amp;&amp; (unlocked == false)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6851,6 +6996,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6882,6 +7029,8 @@
 <guard value="[ (pilotOutside &gt; 0) || (crewOutside &gt; 0)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6912,6 +7061,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6943,6 +7094,8 @@
 <guard value="[ peopleInside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6973,6 +7126,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7004,6 +7159,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7034,6 +7191,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7064,6 +7223,8 @@
 <guard value="[ peopleInside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7094,6 +7255,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7124,6 +7287,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7155,6 +7320,8 @@
 <guard value="[ (peopleOutside &gt; 0) &amp;&amp; (unlocked == true)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7185,6 +7352,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7216,6 +7385,8 @@
 <guard value="[ peopleInside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7246,6 +7417,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7277,6 +7450,8 @@
 <guard value="[ peopleInside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7317,6 +7492,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7348,6 +7525,8 @@
 <guard value="[ buzzerOn == true]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7378,6 +7557,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7409,6 +7590,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7440,6 +7623,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7470,6 +7655,8 @@
 <guard value="[ peopleOutside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7500,6 +7687,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7530,6 +7719,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7560,6 +7751,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7591,6 +7784,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7621,6 +7816,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7651,6 +7848,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7681,6 +7880,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7711,6 +7912,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7742,6 +7945,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7773,6 +7978,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -7803,6 +8010,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -8875,6 +9084,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -8907,6 +9118,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -8939,6 +9152,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -8969,6 +9184,8 @@
 <guard value="[ pilotsInCabin &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -8999,6 +9216,8 @@
 <guard value="[ pilotsInCockpit &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9029,6 +9248,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9061,6 +9282,8 @@
 <guard value="[ cabinCrewInCabin &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9091,6 +9314,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9123,6 +9348,8 @@
 <guard value="[ cabinCrewInCockpit &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9153,6 +9380,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9185,6 +9414,8 @@
 <guard value="[ PassengersInCabin &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9215,6 +9446,8 @@
 <guard value="[ passengersInCockpit &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9245,6 +9478,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9277,6 +9512,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9308,6 +9545,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9338,6 +9577,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9368,6 +9609,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9398,6 +9641,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9428,6 +9673,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9929,6 +10176,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9959,6 +10208,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -9990,6 +10241,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10020,6 +10273,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10051,6 +10306,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10081,6 +10338,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10112,6 +10371,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10142,6 +10403,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10173,6 +10436,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10203,6 +10468,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10234,6 +10501,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10264,6 +10533,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10295,6 +10566,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10325,6 +10598,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10385,6 +10660,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10415,6 +10692,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10445,6 +10724,8 @@
 <guard value="[ peopleInside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10475,6 +10756,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10505,6 +10788,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -10978,6 +11263,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11008,6 +11295,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11058,6 +11347,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11088,6 +11379,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11118,6 +11411,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11158,6 +11453,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11188,6 +11485,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11218,6 +11517,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11268,6 +11569,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11298,6 +11601,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11328,6 +11633,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11358,6 +11665,8 @@
 <guard value="[  ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11388,6 +11697,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11418,6 +11729,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11448,6 +11761,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11903,6 +12218,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -11963,6 +12280,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12023,6 +12342,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12053,6 +12374,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12083,6 +12406,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12113,6 +12438,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12143,6 +12470,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12173,6 +12502,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12203,6 +12534,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12518,6 +12851,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12578,6 +12913,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12638,6 +12975,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12668,6 +13007,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12698,6 +13039,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12728,6 +13071,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12758,6 +13103,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12788,6 +13135,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -12818,6 +13167,8 @@
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13088,7 +13439,8 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<considerTimingOperators value="true" />
+<Validated value="Person;DoorAndLockButton;OnboardPersons;Captain;Crew;Passenger;FirstOfficer;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="6598" >
@@ -13114,12 +13466,12 @@
 <osd value="out enterCockpit()" />
 <osd value="out leaveCockit()" />
 <osd value="out sendEmergency()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
 <COMPONENT type="303" id="6615" >
 <cdparam x="302" y="473" />
-<sizeparam width="882" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="845" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="3000" minY="10" maxY="1500" />
 <infoparam name="UPPAAL Pragma" value="E&lt;&gt; Passenger.isInCockpit ==true&amp;&amp;DoorAndLockButton.inside==1
@@ -13159,7 +13511,7 @@ DoorAndLockButton.IN_EMERGENCY_CALL --&gt; DoorAndLockButton.CLOSED_AND_LOCKED |
 
 <COMPONENT type="301" id="6632" >
 <cdparam x="17" y="474" />
-<sizeparam width="255" height="87" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="237" height="87" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="3000" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="To add a person, clone e.g. &quot;Captain&quot;
@@ -13315,11 +13667,11 @@ in DoorAndLockButton
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="6691" >
 <father id="6791" num="0" />
-<cdparam x="64" y="322" />
+<cdparam x="65" y="217" />
 <sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="525" minY="0" maxY="321" />
-<infoparam name="Block0" value="FirstOfficer" />
+<infoparam name="Block0" value="Captain" />
 <TGConnectingPoint num="0" id="6667" />
 <TGConnectingPoint num="1" id="6668" />
 <TGConnectingPoint num="2" id="6669" />
@@ -13353,11 +13705,11 @@ in DoorAndLockButton
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="6716" >
 <father id="6791" num="1" />
-<cdparam x="534" y="247" />
+<cdparam x="299" y="249" />
 <sizeparam width="225" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="525" minY="0" maxY="285" />
-<infoparam name="Block0" value="Passenger" />
+<infoparam name="Block0" value="Crew" />
 <TGConnectingPoint num="0" id="6692" />
 <TGConnectingPoint num="1" id="6693" />
 <TGConnectingPoint num="2" id="6694" />
@@ -13386,16 +13738,16 @@ in DoorAndLockButton
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
 <Attribute access="0" id="isInCockpit" value="false" type="4" typeOther="" />
-<Attribute access="0" id="knowsEmergencyCode" value="false" type="4" typeOther="" />
+<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="6741" >
 <father id="6791" num="2" />
-<cdparam x="299" y="249" />
+<cdparam x="534" y="247" />
 <sizeparam width="225" height="134" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="525" minY="0" maxY="285" />
-<infoparam name="Block0" value="Crew" />
+<infoparam name="Block0" value="Passenger" />
 <TGConnectingPoint num="0" id="6717" />
 <TGConnectingPoint num="1" id="6718" />
 <TGConnectingPoint num="2" id="6719" />
@@ -13424,16 +13776,16 @@ in DoorAndLockButton
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
 <Attribute access="0" id="isInCockpit" value="false" type="4" typeOther="" />
-<Attribute access="0" id="knowsEmergencyCode" value="true" type="4" typeOther="" />
+<Attribute access="0" id="knowsEmergencyCode" value="false" type="4" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="6766" >
 <father id="6791" num="3" />
-<cdparam x="65" y="217" />
+<cdparam x="64" y="322" />
 <sizeparam width="225" height="98" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="525" minY="0" maxY="321" />
-<infoparam name="Block0" value="Captain" />
+<infoparam name="Block0" value="FirstOfficer" />
 <TGConnectingPoint num="0" id="6742" />
 <TGConnectingPoint num="1" id="6743" />
 <TGConnectingPoint num="2" id="6744" />
@@ -13507,6 +13859,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13578,6 +13932,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13648,6 +14004,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="1" enabled="true"/>
 <afterMax value="1" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13678,6 +14036,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13710,6 +14070,8 @@ in DoorAndLockButton
 <guard value="[ outside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13780,6 +14142,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13850,6 +14214,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13880,6 +14246,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13910,6 +14278,8 @@ in DoorAndLockButton
 <guard value="[ inside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13940,6 +14310,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -13970,6 +14342,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14000,6 +14374,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14030,6 +14406,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14060,6 +14438,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14090,6 +14470,8 @@ in DoorAndLockButton
 <guard value="[ inside &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14120,6 +14502,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14152,6 +14536,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14182,6 +14568,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14212,6 +14600,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14933,6 +15323,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -14963,6 +15355,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15046,6 +15440,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15076,6 +15472,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15106,6 +15504,8 @@ in DoorAndLockButton
 <guard value="[ isInCockpit]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15136,6 +15536,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15166,6 +15568,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15196,6 +15600,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15226,6 +15632,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15256,6 +15664,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15287,6 +15697,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15318,6 +15730,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15348,6 +15762,8 @@ in DoorAndLockButton
 <guard value="[ isInCockpit]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15378,6 +15794,8 @@ in DoorAndLockButton
 <guard value="[ not(isInCockpit)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15408,6 +15826,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15438,6 +15858,8 @@ in DoorAndLockButton
 <guard value="[ isInCockpit ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15468,6 +15890,8 @@ in DoorAndLockButton
 <guard value="[ (isInCockpit == false) and (knowsEmergencyCode == true)]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15810,6 +16234,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15840,6 +16266,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15923,6 +16351,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -15953,6 +16383,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -16036,6 +16468,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -16066,6 +16500,8 @@ in DoorAndLockButton
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index 04fbc3ec3c52b403f1a5e8a3deac2ce65231c201..5e66ceeb300ae67e4de0c8b010ac136857118a36 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -1287,8 +1287,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
 <TGConnectingPoint num="0" id="694" />
-<P1  x="559" y="330" id="756" />
-<P2  x="560" y="377" id="814" />
+<P1  x="560" y="351" id="748" />
+<P2  x="560" y="377" id="806" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushCoffeeButton()" />
@@ -1301,8 +1301,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="696" />
-<P1  x="306" y="109" id="736" />
-<P2  x="445" y="108" id="810" />
+<P1  x="306" y="109" id="728" />
+<P2  x="445" y="108" id="802" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in getCoin(int nbOfCoins)" />
@@ -1317,8 +1317,8 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
 <TGConnectingPoint num="0" id="698" />
-<P1  x="789" y="326" id="781" />
-<P2  x="790" y="377" id="815" />
+<P1  x="790" y="350" id="773" />
+<P2  x="790" y="377" id="807" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in pushTeaButton()" />
@@ -1326,36 +1326,78 @@
 <FIFOType asynchronous="false" size="1024" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="5000" id="749" >
+<COMPONENT type="303" id="716" >
+<cdparam x="104" y="347" />
+<sizeparam width="241" height="123" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="UPPAAL Pragma" value="A[] CoffeeMachine.nbOfCoins&lt;=2
+E&lt;&gt; CoffeeMachine.nbOfCoins&gt;0
+E&lt;&gt; CoffeeMachine.nbOfCoins&gt;1
+E[] CoffeeMachine.nbOfCoins&lt;2
+
+A[] Wallet.nbOfCoins&lt;3
+A[] Wallet.nbOfCoins&gt;=0
+E[] Wallet.nbOfCoins&gt;=1
+" />
+<TGConnectingPoint num="0" id="700" />
+<TGConnectingPoint num="1" id="701" />
+<TGConnectingPoint num="2" id="702" />
+<TGConnectingPoint num="3" id="703" />
+<TGConnectingPoint num="4" id="704" />
+<TGConnectingPoint num="5" id="705" />
+<TGConnectingPoint num="6" id="706" />
+<TGConnectingPoint num="7" id="707" />
+<TGConnectingPoint num="8" id="708" />
+<TGConnectingPoint num="9" id="709" />
+<TGConnectingPoint num="10" id="710" />
+<TGConnectingPoint num="11" id="711" />
+<TGConnectingPoint num="12" id="712" />
+<TGConnectingPoint num="13" id="713" />
+<TGConnectingPoint num="14" id="714" />
+<TGConnectingPoint num="15" id="715" />
+<extraparam>
+<Line value="A[] CoffeeMachine.nbOfCoins&lt;=2" />
+<Line value="E&lt;&gt; CoffeeMachine.nbOfCoins&gt;0" />
+<Line value="E&lt;&gt; CoffeeMachine.nbOfCoins&gt;1" />
+<Line value="E[] CoffeeMachine.nbOfCoins&lt;2" />
+<Line value="" />
+<Line value="A[] Wallet.nbOfCoins&lt;3" />
+<Line value="A[] Wallet.nbOfCoins&gt;=0" />
+<Line value="E[] Wallet.nbOfCoins&gt;=1" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="741" >
 <cdparam x="106" y="55" />
 <sizeparam width="200" height="218" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Wallet" />
-<TGConnectingPoint num="0" id="725" />
-<TGConnectingPoint num="1" id="726" />
-<TGConnectingPoint num="2" id="727" />
-<TGConnectingPoint num="3" id="728" />
-<TGConnectingPoint num="4" id="729" />
-<TGConnectingPoint num="5" id="730" />
-<TGConnectingPoint num="6" id="731" />
-<TGConnectingPoint num="7" id="732" />
-<TGConnectingPoint num="8" id="733" />
-<TGConnectingPoint num="9" id="734" />
-<TGConnectingPoint num="10" id="735" />
-<TGConnectingPoint num="11" id="736" />
-<TGConnectingPoint num="12" id="737" />
-<TGConnectingPoint num="13" id="738" />
-<TGConnectingPoint num="14" id="739" />
-<TGConnectingPoint num="15" id="740" />
-<TGConnectingPoint num="16" id="741" />
-<TGConnectingPoint num="17" id="742" />
-<TGConnectingPoint num="18" id="743" />
-<TGConnectingPoint num="19" id="744" />
-<TGConnectingPoint num="20" id="745" />
-<TGConnectingPoint num="21" id="746" />
-<TGConnectingPoint num="22" id="747" />
-<TGConnectingPoint num="23" id="748" />
+<TGConnectingPoint num="0" id="717" />
+<TGConnectingPoint num="1" id="718" />
+<TGConnectingPoint num="2" id="719" />
+<TGConnectingPoint num="3" id="720" />
+<TGConnectingPoint num="4" id="721" />
+<TGConnectingPoint num="5" id="722" />
+<TGConnectingPoint num="6" id="723" />
+<TGConnectingPoint num="7" id="724" />
+<TGConnectingPoint num="8" id="725" />
+<TGConnectingPoint num="9" id="726" />
+<TGConnectingPoint num="10" id="727" />
+<TGConnectingPoint num="11" id="728" />
+<TGConnectingPoint num="12" id="729" />
+<TGConnectingPoint num="13" id="730" />
+<TGConnectingPoint num="14" id="731" />
+<TGConnectingPoint num="15" id="732" />
+<TGConnectingPoint num="16" id="733" />
+<TGConnectingPoint num="17" id="734" />
+<TGConnectingPoint num="18" id="735" />
+<TGConnectingPoint num="19" id="736" />
+<TGConnectingPoint num="20" id="737" />
+<TGConnectingPoint num="21" id="738" />
+<TGConnectingPoint num="22" id="739" />
+<TGConnectingPoint num="23" id="740" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1369,36 +1411,36 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="824" >
+<COMPONENT type="5000" id="816" >
 <cdparam x="445" y="19" />
 <sizeparam width="461" height="358" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="CoffeeMachine" />
-<TGConnectingPoint num="0" id="800" />
-<TGConnectingPoint num="1" id="801" />
-<TGConnectingPoint num="2" id="802" />
-<TGConnectingPoint num="3" id="803" />
-<TGConnectingPoint num="4" id="804" />
-<TGConnectingPoint num="5" id="805" />
-<TGConnectingPoint num="6" id="806" />
-<TGConnectingPoint num="7" id="807" />
-<TGConnectingPoint num="8" id="808" />
-<TGConnectingPoint num="9" id="809" />
-<TGConnectingPoint num="10" id="810" />
-<TGConnectingPoint num="11" id="811" />
-<TGConnectingPoint num="12" id="812" />
-<TGConnectingPoint num="13" id="813" />
-<TGConnectingPoint num="14" id="814" />
-<TGConnectingPoint num="15" id="815" />
-<TGConnectingPoint num="16" id="816" />
-<TGConnectingPoint num="17" id="817" />
-<TGConnectingPoint num="18" id="818" />
-<TGConnectingPoint num="19" id="819" />
-<TGConnectingPoint num="20" id="820" />
-<TGConnectingPoint num="21" id="821" />
-<TGConnectingPoint num="22" id="822" />
-<TGConnectingPoint num="23" id="823" />
+<TGConnectingPoint num="0" id="792" />
+<TGConnectingPoint num="1" id="793" />
+<TGConnectingPoint num="2" id="794" />
+<TGConnectingPoint num="3" id="795" />
+<TGConnectingPoint num="4" id="796" />
+<TGConnectingPoint num="5" id="797" />
+<TGConnectingPoint num="6" id="798" />
+<TGConnectingPoint num="7" id="799" />
+<TGConnectingPoint num="8" id="800" />
+<TGConnectingPoint num="9" id="801" />
+<TGConnectingPoint num="10" id="802" />
+<TGConnectingPoint num="11" id="803" />
+<TGConnectingPoint num="12" id="804" />
+<TGConnectingPoint num="13" id="805" />
+<TGConnectingPoint num="14" id="806" />
+<TGConnectingPoint num="15" id="807" />
+<TGConnectingPoint num="16" id="808" />
+<TGConnectingPoint num="17" id="809" />
+<TGConnectingPoint num="18" id="810" />
+<TGConnectingPoint num="19" id="811" />
+<TGConnectingPoint num="20" id="812" />
+<TGConnectingPoint num="21" id="813" />
+<TGConnectingPoint num="22" id="814" />
+<TGConnectingPoint num="23" id="815" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1416,37 +1458,37 @@
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="774" >
-<father id="824" num="0" />
-<cdparam x="464" y="228" />
+<SUBCOMPONENT type="5000" id="766" >
+<father id="816" num="0" />
+<cdparam x="465" y="249" />
 <sizeparam width="190" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="271" minY="0" maxY="256" />
 <infoparam name="Block1" value="CoffeeButton" />
-<TGConnectingPoint num="0" id="750" />
-<TGConnectingPoint num="1" id="751" />
-<TGConnectingPoint num="2" id="752" />
-<TGConnectingPoint num="3" id="753" />
-<TGConnectingPoint num="4" id="754" />
-<TGConnectingPoint num="5" id="755" />
-<TGConnectingPoint num="6" id="756" />
-<TGConnectingPoint num="7" id="757" />
-<TGConnectingPoint num="8" id="758" />
-<TGConnectingPoint num="9" id="759" />
-<TGConnectingPoint num="10" id="760" />
-<TGConnectingPoint num="11" id="761" />
-<TGConnectingPoint num="12" id="762" />
-<TGConnectingPoint num="13" id="763" />
-<TGConnectingPoint num="14" id="764" />
-<TGConnectingPoint num="15" id="765" />
-<TGConnectingPoint num="16" id="766" />
-<TGConnectingPoint num="17" id="767" />
-<TGConnectingPoint num="18" id="768" />
-<TGConnectingPoint num="19" id="769" />
-<TGConnectingPoint num="20" id="770" />
-<TGConnectingPoint num="21" id="771" />
-<TGConnectingPoint num="22" id="772" />
-<TGConnectingPoint num="23" id="773" />
+<TGConnectingPoint num="0" id="742" />
+<TGConnectingPoint num="1" id="743" />
+<TGConnectingPoint num="2" id="744" />
+<TGConnectingPoint num="3" id="745" />
+<TGConnectingPoint num="4" id="746" />
+<TGConnectingPoint num="5" id="747" />
+<TGConnectingPoint num="6" id="748" />
+<TGConnectingPoint num="7" id="749" />
+<TGConnectingPoint num="8" id="750" />
+<TGConnectingPoint num="9" id="751" />
+<TGConnectingPoint num="10" id="752" />
+<TGConnectingPoint num="11" id="753" />
+<TGConnectingPoint num="12" id="754" />
+<TGConnectingPoint num="13" id="755" />
+<TGConnectingPoint num="14" id="756" />
+<TGConnectingPoint num="15" id="757" />
+<TGConnectingPoint num="16" id="758" />
+<TGConnectingPoint num="17" id="759" />
+<TGConnectingPoint num="18" id="760" />
+<TGConnectingPoint num="19" id="761" />
+<TGConnectingPoint num="20" id="762" />
+<TGConnectingPoint num="21" id="763" />
+<TGConnectingPoint num="22" id="764" />
+<TGConnectingPoint num="23" id="765" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1454,37 +1496,37 @@
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="799" >
-<father id="824" num="1" />
-<cdparam x="695" y="224" />
+<SUBCOMPONENT type="5000" id="791" >
+<father id="816" num="1" />
+<cdparam x="696" y="248" />
 <sizeparam width="189" height="102" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
 <infoparam name="Block1" value="TeaButton" />
-<TGConnectingPoint num="0" id="775" />
-<TGConnectingPoint num="1" id="776" />
-<TGConnectingPoint num="2" id="777" />
-<TGConnectingPoint num="3" id="778" />
-<TGConnectingPoint num="4" id="779" />
-<TGConnectingPoint num="5" id="780" />
-<TGConnectingPoint num="6" id="781" />
-<TGConnectingPoint num="7" id="782" />
-<TGConnectingPoint num="8" id="783" />
-<TGConnectingPoint num="9" id="784" />
-<TGConnectingPoint num="10" id="785" />
-<TGConnectingPoint num="11" id="786" />
-<TGConnectingPoint num="12" id="787" />
-<TGConnectingPoint num="13" id="788" />
-<TGConnectingPoint num="14" id="789" />
-<TGConnectingPoint num="15" id="790" />
-<TGConnectingPoint num="16" id="791" />
-<TGConnectingPoint num="17" id="792" />
-<TGConnectingPoint num="18" id="793" />
-<TGConnectingPoint num="19" id="794" />
-<TGConnectingPoint num="20" id="795" />
-<TGConnectingPoint num="21" id="796" />
-<TGConnectingPoint num="22" id="797" />
-<TGConnectingPoint num="23" id="798" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
+<TGConnectingPoint num="4" id="771" />
+<TGConnectingPoint num="5" id="772" />
+<TGConnectingPoint num="6" id="773" />
+<TGConnectingPoint num="7" id="774" />
+<TGConnectingPoint num="8" id="775" />
+<TGConnectingPoint num="9" id="776" />
+<TGConnectingPoint num="10" id="777" />
+<TGConnectingPoint num="11" id="778" />
+<TGConnectingPoint num="12" id="779" />
+<TGConnectingPoint num="13" id="780" />
+<TGConnectingPoint num="14" id="781" />
+<TGConnectingPoint num="15" id="782" />
+<TGConnectingPoint num="16" id="783" />
+<TGConnectingPoint num="17" id="784" />
+<TGConnectingPoint num="18" id="785" />
+<TGConnectingPoint num="19" id="786" />
+<TGConnectingPoint num="20" id="787" />
+<TGConnectingPoint num="21" id="788" />
+<TGConnectingPoint num="22" id="789" />
+<TGConnectingPoint num="23" id="790" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -1497,766 +1539,784 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="831" >
+<CONNECTOR type="5102" id="823" >
 <cdparam x="177" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="830" />
-<P1  x="340" y="233" id="1012" />
-<P2  x="353" y="252" id="1001" />
+<TGConnectingPoint num="0" id="822" />
+<P1  x="340" y="233" id="1004" />
+<P2  x="353" y="252" id="993" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="829" >
-<father id="831" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="821" >
+<father id="823" num="0" />
 <cdparam x="177" y="239" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="825" />
-<TGConnectingPoint num="1" id="826" />
-<TGConnectingPoint num="2" id="827" />
-<TGConnectingPoint num="3" id="828" />
+<TGConnectingPoint num="0" id="817" />
+<TGConnectingPoint num="1" id="818" />
+<TGConnectingPoint num="2" id="819" />
+<TGConnectingPoint num="3" id="820" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="838" >
+<CONNECTOR type="5102" id="830" >
 <cdparam x="322" y="69" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="837" />
-<P1  x="322" y="69" id="999" />
-<P2  x="322" y="88" id="927" />
+<TGConnectingPoint num="0" id="829" />
+<P1  x="322" y="69" id="991" />
+<P2  x="322" y="88" id="919" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="836" >
-<father id="838" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="828" >
+<father id="830" num="0" />
 <cdparam x="322" y="109" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="832" />
-<TGConnectingPoint num="1" id="833" />
-<TGConnectingPoint num="2" id="834" />
-<TGConnectingPoint num="3" id="835" />
+<TGConnectingPoint num="0" id="824" />
+<TGConnectingPoint num="1" id="825" />
+<TGConnectingPoint num="2" id="826" />
+<TGConnectingPoint num="3" id="827" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="845" >
+<CONNECTOR type="5102" id="837" >
 <cdparam x="377" y="144" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="844" />
-<P1  x="322" y="118" id="932" />
-<P2  x="356" y="174" id="1015" />
+<TGConnectingPoint num="0" id="836" />
+<P1  x="322" y="118" id="924" />
+<P2  x="356" y="174" id="1007" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="843" >
-<father id="845" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="835" >
+<father id="837" num="0" />
 <cdparam x="377" y="184" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="839" />
-<TGConnectingPoint num="1" id="840" />
-<TGConnectingPoint num="2" id="841" />
-<TGConnectingPoint num="3" id="842" />
+<TGConnectingPoint num="0" id="831" />
+<TGConnectingPoint num="1" id="832" />
+<TGConnectingPoint num="2" id="833" />
+<TGConnectingPoint num="3" id="834" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="852" >
+<CONNECTOR type="5102" id="844" >
 <cdparam x="377" y="187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="851" />
-<P1  x="353" y="282" id="1002" />
-<P2  x="399" y="352" id="854" />
+<TGConnectingPoint num="0" id="843" />
+<P1  x="353" y="282" id="994" />
+<P2  x="399" y="352" id="846" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="850" >
-<father id="852" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="842" >
+<father id="844" num="0" />
 <cdparam x="417" y="335" />
 <sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="846" />
-<TGConnectingPoint num="1" id="847" />
-<TGConnectingPoint num="2" id="848" />
-<TGConnectingPoint num="3" id="849" />
+<TGConnectingPoint num="0" id="838" />
+<TGConnectingPoint num="1" id="839" />
+<TGConnectingPoint num="2" id="840" />
+<TGConnectingPoint num="3" id="841" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="mechanicalDelay" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="925" >
+<COMPONENT type="5106" id="917" >
 <cdparam x="374" y="352" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="853" />
-<TGConnectingPoint num="1" id="854" />
-<TGConnectingPoint num="2" id="855" />
-<TGConnectingPoint num="3" id="856" />
-<TGConnectingPoint num="4" id="857" />
-<TGConnectingPoint num="5" id="858" />
-<TGConnectingPoint num="6" id="859" />
-<TGConnectingPoint num="7" id="860" />
-<TGConnectingPoint num="8" id="861" />
-<TGConnectingPoint num="9" id="862" />
-<TGConnectingPoint num="10" id="863" />
-<TGConnectingPoint num="11" id="864" />
-<TGConnectingPoint num="12" id="865" />
-<TGConnectingPoint num="13" id="866" />
-<TGConnectingPoint num="14" id="867" />
-<TGConnectingPoint num="15" id="868" />
-<TGConnectingPoint num="16" id="869" />
-<TGConnectingPoint num="17" id="870" />
-<TGConnectingPoint num="18" id="871" />
-<TGConnectingPoint num="19" id="872" />
-<TGConnectingPoint num="20" id="873" />
-<TGConnectingPoint num="21" id="874" />
-<TGConnectingPoint num="22" id="875" />
-<TGConnectingPoint num="23" id="876" />
-<TGConnectingPoint num="24" id="877" />
-<TGConnectingPoint num="25" id="878" />
-<TGConnectingPoint num="26" id="879" />
-<TGConnectingPoint num="27" id="880" />
-<TGConnectingPoint num="28" id="881" />
-<TGConnectingPoint num="29" id="882" />
-<TGConnectingPoint num="30" id="883" />
-<TGConnectingPoint num="31" id="884" />
-<TGConnectingPoint num="32" id="885" />
-<TGConnectingPoint num="33" id="886" />
-<TGConnectingPoint num="34" id="887" />
-<TGConnectingPoint num="35" id="888" />
-<TGConnectingPoint num="36" id="889" />
-<TGConnectingPoint num="37" id="890" />
-<TGConnectingPoint num="38" id="891" />
-<TGConnectingPoint num="39" id="892" />
-<TGConnectingPoint num="40" id="893" />
-<TGConnectingPoint num="41" id="894" />
-<TGConnectingPoint num="42" id="895" />
-<TGConnectingPoint num="43" id="896" />
-<TGConnectingPoint num="44" id="897" />
-<TGConnectingPoint num="45" id="898" />
-<TGConnectingPoint num="46" id="899" />
-<TGConnectingPoint num="47" id="900" />
-<TGConnectingPoint num="48" id="901" />
-<TGConnectingPoint num="49" id="902" />
-<TGConnectingPoint num="50" id="903" />
-<TGConnectingPoint num="51" id="904" />
-<TGConnectingPoint num="52" id="905" />
-<TGConnectingPoint num="53" id="906" />
-<TGConnectingPoint num="54" id="907" />
-<TGConnectingPoint num="55" id="908" />
-<TGConnectingPoint num="56" id="909" />
-<TGConnectingPoint num="57" id="910" />
-<TGConnectingPoint num="58" id="911" />
-<TGConnectingPoint num="59" id="912" />
-<TGConnectingPoint num="60" id="913" />
-<TGConnectingPoint num="61" id="914" />
-<TGConnectingPoint num="62" id="915" />
-<TGConnectingPoint num="63" id="916" />
-<TGConnectingPoint num="64" id="917" />
-<TGConnectingPoint num="65" id="918" />
-<TGConnectingPoint num="66" id="919" />
-<TGConnectingPoint num="67" id="920" />
-<TGConnectingPoint num="68" id="921" />
-<TGConnectingPoint num="69" id="922" />
-<TGConnectingPoint num="70" id="923" />
-<TGConnectingPoint num="71" id="924" />
+<TGConnectingPoint num="0" id="845" />
+<TGConnectingPoint num="1" id="846" />
+<TGConnectingPoint num="2" id="847" />
+<TGConnectingPoint num="3" id="848" />
+<TGConnectingPoint num="4" id="849" />
+<TGConnectingPoint num="5" id="850" />
+<TGConnectingPoint num="6" id="851" />
+<TGConnectingPoint num="7" id="852" />
+<TGConnectingPoint num="8" id="853" />
+<TGConnectingPoint num="9" id="854" />
+<TGConnectingPoint num="10" id="855" />
+<TGConnectingPoint num="11" id="856" />
+<TGConnectingPoint num="12" id="857" />
+<TGConnectingPoint num="13" id="858" />
+<TGConnectingPoint num="14" id="859" />
+<TGConnectingPoint num="15" id="860" />
+<TGConnectingPoint num="16" id="861" />
+<TGConnectingPoint num="17" id="862" />
+<TGConnectingPoint num="18" id="863" />
+<TGConnectingPoint num="19" id="864" />
+<TGConnectingPoint num="20" id="865" />
+<TGConnectingPoint num="21" id="866" />
+<TGConnectingPoint num="22" id="867" />
+<TGConnectingPoint num="23" id="868" />
+<TGConnectingPoint num="24" id="869" />
+<TGConnectingPoint num="25" id="870" />
+<TGConnectingPoint num="26" id="871" />
+<TGConnectingPoint num="27" id="872" />
+<TGConnectingPoint num="28" id="873" />
+<TGConnectingPoint num="29" id="874" />
+<TGConnectingPoint num="30" id="875" />
+<TGConnectingPoint num="31" id="876" />
+<TGConnectingPoint num="32" id="877" />
+<TGConnectingPoint num="33" id="878" />
+<TGConnectingPoint num="34" id="879" />
+<TGConnectingPoint num="35" id="880" />
+<TGConnectingPoint num="36" id="881" />
+<TGConnectingPoint num="37" id="882" />
+<TGConnectingPoint num="38" id="883" />
+<TGConnectingPoint num="39" id="884" />
+<TGConnectingPoint num="40" id="885" />
+<TGConnectingPoint num="41" id="886" />
+<TGConnectingPoint num="42" id="887" />
+<TGConnectingPoint num="43" id="888" />
+<TGConnectingPoint num="44" id="889" />
+<TGConnectingPoint num="45" id="890" />
+<TGConnectingPoint num="46" id="891" />
+<TGConnectingPoint num="47" id="892" />
+<TGConnectingPoint num="48" id="893" />
+<TGConnectingPoint num="49" id="894" />
+<TGConnectingPoint num="50" id="895" />
+<TGConnectingPoint num="51" id="896" />
+<TGConnectingPoint num="52" id="897" />
+<TGConnectingPoint num="53" id="898" />
+<TGConnectingPoint num="54" id="899" />
+<TGConnectingPoint num="55" id="900" />
+<TGConnectingPoint num="56" id="901" />
+<TGConnectingPoint num="57" id="902" />
+<TGConnectingPoint num="58" id="903" />
+<TGConnectingPoint num="59" id="904" />
+<TGConnectingPoint num="60" id="905" />
+<TGConnectingPoint num="61" id="906" />
+<TGConnectingPoint num="62" id="907" />
+<TGConnectingPoint num="63" id="908" />
+<TGConnectingPoint num="64" id="909" />
+<TGConnectingPoint num="65" id="910" />
+<TGConnectingPoint num="66" id="911" />
+<TGConnectingPoint num="67" id="912" />
+<TGConnectingPoint num="68" id="913" />
+<TGConnectingPoint num="69" id="914" />
+<TGConnectingPoint num="70" id="915" />
+<TGConnectingPoint num="71" id="916" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="998" >
+<COMPONENT type="5106" id="990" >
 <cdparam x="297" y="88" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="926" />
-<TGConnectingPoint num="1" id="927" />
-<TGConnectingPoint num="2" id="928" />
-<TGConnectingPoint num="3" id="929" />
-<TGConnectingPoint num="4" id="930" />
-<TGConnectingPoint num="5" id="931" />
-<TGConnectingPoint num="6" id="932" />
-<TGConnectingPoint num="7" id="933" />
-<TGConnectingPoint num="8" id="934" />
-<TGConnectingPoint num="9" id="935" />
-<TGConnectingPoint num="10" id="936" />
-<TGConnectingPoint num="11" id="937" />
-<TGConnectingPoint num="12" id="938" />
-<TGConnectingPoint num="13" id="939" />
-<TGConnectingPoint num="14" id="940" />
-<TGConnectingPoint num="15" id="941" />
-<TGConnectingPoint num="16" id="942" />
-<TGConnectingPoint num="17" id="943" />
-<TGConnectingPoint num="18" id="944" />
-<TGConnectingPoint num="19" id="945" />
-<TGConnectingPoint num="20" id="946" />
-<TGConnectingPoint num="21" id="947" />
-<TGConnectingPoint num="22" id="948" />
-<TGConnectingPoint num="23" id="949" />
-<TGConnectingPoint num="24" id="950" />
-<TGConnectingPoint num="25" id="951" />
-<TGConnectingPoint num="26" id="952" />
-<TGConnectingPoint num="27" id="953" />
-<TGConnectingPoint num="28" id="954" />
-<TGConnectingPoint num="29" id="955" />
-<TGConnectingPoint num="30" id="956" />
-<TGConnectingPoint num="31" id="957" />
-<TGConnectingPoint num="32" id="958" />
-<TGConnectingPoint num="33" id="959" />
-<TGConnectingPoint num="34" id="960" />
-<TGConnectingPoint num="35" id="961" />
-<TGConnectingPoint num="36" id="962" />
-<TGConnectingPoint num="37" id="963" />
-<TGConnectingPoint num="38" id="964" />
-<TGConnectingPoint num="39" id="965" />
-<TGConnectingPoint num="40" id="966" />
-<TGConnectingPoint num="41" id="967" />
-<TGConnectingPoint num="42" id="968" />
-<TGConnectingPoint num="43" id="969" />
-<TGConnectingPoint num="44" id="970" />
-<TGConnectingPoint num="45" id="971" />
-<TGConnectingPoint num="46" id="972" />
-<TGConnectingPoint num="47" id="973" />
-<TGConnectingPoint num="48" id="974" />
-<TGConnectingPoint num="49" id="975" />
-<TGConnectingPoint num="50" id="976" />
-<TGConnectingPoint num="51" id="977" />
-<TGConnectingPoint num="52" id="978" />
-<TGConnectingPoint num="53" id="979" />
-<TGConnectingPoint num="54" id="980" />
-<TGConnectingPoint num="55" id="981" />
-<TGConnectingPoint num="56" id="982" />
-<TGConnectingPoint num="57" id="983" />
-<TGConnectingPoint num="58" id="984" />
-<TGConnectingPoint num="59" id="985" />
-<TGConnectingPoint num="60" id="986" />
-<TGConnectingPoint num="61" id="987" />
-<TGConnectingPoint num="62" id="988" />
-<TGConnectingPoint num="63" id="989" />
-<TGConnectingPoint num="64" id="990" />
-<TGConnectingPoint num="65" id="991" />
-<TGConnectingPoint num="66" id="992" />
-<TGConnectingPoint num="67" id="993" />
-<TGConnectingPoint num="68" id="994" />
-<TGConnectingPoint num="69" id="995" />
-<TGConnectingPoint num="70" id="996" />
-<TGConnectingPoint num="71" id="997" />
+<TGConnectingPoint num="0" id="918" />
+<TGConnectingPoint num="1" id="919" />
+<TGConnectingPoint num="2" id="920" />
+<TGConnectingPoint num="3" id="921" />
+<TGConnectingPoint num="4" id="922" />
+<TGConnectingPoint num="5" id="923" />
+<TGConnectingPoint num="6" id="924" />
+<TGConnectingPoint num="7" id="925" />
+<TGConnectingPoint num="8" id="926" />
+<TGConnectingPoint num="9" id="927" />
+<TGConnectingPoint num="10" id="928" />
+<TGConnectingPoint num="11" id="929" />
+<TGConnectingPoint num="12" id="930" />
+<TGConnectingPoint num="13" id="931" />
+<TGConnectingPoint num="14" id="932" />
+<TGConnectingPoint num="15" id="933" />
+<TGConnectingPoint num="16" id="934" />
+<TGConnectingPoint num="17" id="935" />
+<TGConnectingPoint num="18" id="936" />
+<TGConnectingPoint num="19" id="937" />
+<TGConnectingPoint num="20" id="938" />
+<TGConnectingPoint num="21" id="939" />
+<TGConnectingPoint num="22" id="940" />
+<TGConnectingPoint num="23" id="941" />
+<TGConnectingPoint num="24" id="942" />
+<TGConnectingPoint num="25" id="943" />
+<TGConnectingPoint num="26" id="944" />
+<TGConnectingPoint num="27" id="945" />
+<TGConnectingPoint num="28" id="946" />
+<TGConnectingPoint num="29" id="947" />
+<TGConnectingPoint num="30" id="948" />
+<TGConnectingPoint num="31" id="949" />
+<TGConnectingPoint num="32" id="950" />
+<TGConnectingPoint num="33" id="951" />
+<TGConnectingPoint num="34" id="952" />
+<TGConnectingPoint num="35" id="953" />
+<TGConnectingPoint num="36" id="954" />
+<TGConnectingPoint num="37" id="955" />
+<TGConnectingPoint num="38" id="956" />
+<TGConnectingPoint num="39" id="957" />
+<TGConnectingPoint num="40" id="958" />
+<TGConnectingPoint num="41" id="959" />
+<TGConnectingPoint num="42" id="960" />
+<TGConnectingPoint num="43" id="961" />
+<TGConnectingPoint num="44" id="962" />
+<TGConnectingPoint num="45" id="963" />
+<TGConnectingPoint num="46" id="964" />
+<TGConnectingPoint num="47" id="965" />
+<TGConnectingPoint num="48" id="966" />
+<TGConnectingPoint num="49" id="967" />
+<TGConnectingPoint num="50" id="968" />
+<TGConnectingPoint num="51" id="969" />
+<TGConnectingPoint num="52" id="970" />
+<TGConnectingPoint num="53" id="971" />
+<TGConnectingPoint num="54" id="972" />
+<TGConnectingPoint num="55" id="973" />
+<TGConnectingPoint num="56" id="974" />
+<TGConnectingPoint num="57" id="975" />
+<TGConnectingPoint num="58" id="976" />
+<TGConnectingPoint num="59" id="977" />
+<TGConnectingPoint num="60" id="978" />
+<TGConnectingPoint num="61" id="979" />
+<TGConnectingPoint num="62" id="980" />
+<TGConnectingPoint num="63" id="981" />
+<TGConnectingPoint num="64" id="982" />
+<TGConnectingPoint num="65" id="983" />
+<TGConnectingPoint num="66" id="984" />
+<TGConnectingPoint num="67" id="985" />
+<TGConnectingPoint num="68" id="986" />
+<TGConnectingPoint num="69" id="987" />
+<TGConnectingPoint num="70" id="988" />
+<TGConnectingPoint num="71" id="989" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1000" >
+<COMPONENT type="5100" id="992" >
 <cdparam x="315" y="49" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="999" />
+<TGConnectingPoint num="0" id="991" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1086" >
+<COMPONENT type="5106" id="1078" >
 <cdparam x="264" y="174" />
 <sizeparam width="184" height="130" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="1014" />
-<TGConnectingPoint num="1" id="1015" />
-<TGConnectingPoint num="2" id="1016" />
-<TGConnectingPoint num="3" id="1017" />
-<TGConnectingPoint num="4" id="1018" />
-<TGConnectingPoint num="5" id="1019" />
-<TGConnectingPoint num="6" id="1020" />
-<TGConnectingPoint num="7" id="1021" />
-<TGConnectingPoint num="8" id="1022" />
-<TGConnectingPoint num="9" id="1023" />
-<TGConnectingPoint num="10" id="1024" />
-<TGConnectingPoint num="11" id="1025" />
-<TGConnectingPoint num="12" id="1026" />
-<TGConnectingPoint num="13" id="1027" />
-<TGConnectingPoint num="14" id="1028" />
-<TGConnectingPoint num="15" id="1029" />
-<TGConnectingPoint num="16" id="1030" />
-<TGConnectingPoint num="17" id="1031" />
-<TGConnectingPoint num="18" id="1032" />
-<TGConnectingPoint num="19" id="1033" />
-<TGConnectingPoint num="20" id="1034" />
-<TGConnectingPoint num="21" id="1035" />
-<TGConnectingPoint num="22" id="1036" />
-<TGConnectingPoint num="23" id="1037" />
-<TGConnectingPoint num="24" id="1038" />
-<TGConnectingPoint num="25" id="1039" />
-<TGConnectingPoint num="26" id="1040" />
-<TGConnectingPoint num="27" id="1041" />
-<TGConnectingPoint num="28" id="1042" />
-<TGConnectingPoint num="29" id="1043" />
-<TGConnectingPoint num="30" id="1044" />
-<TGConnectingPoint num="31" id="1045" />
-<TGConnectingPoint num="32" id="1046" />
-<TGConnectingPoint num="33" id="1047" />
-<TGConnectingPoint num="34" id="1048" />
-<TGConnectingPoint num="35" id="1049" />
-<TGConnectingPoint num="36" id="1050" />
-<TGConnectingPoint num="37" id="1051" />
-<TGConnectingPoint num="38" id="1052" />
-<TGConnectingPoint num="39" id="1053" />
-<TGConnectingPoint num="40" id="1054" />
-<TGConnectingPoint num="41" id="1055" />
-<TGConnectingPoint num="42" id="1056" />
-<TGConnectingPoint num="43" id="1057" />
-<TGConnectingPoint num="44" id="1058" />
-<TGConnectingPoint num="45" id="1059" />
-<TGConnectingPoint num="46" id="1060" />
-<TGConnectingPoint num="47" id="1061" />
-<TGConnectingPoint num="48" id="1062" />
-<TGConnectingPoint num="49" id="1063" />
-<TGConnectingPoint num="50" id="1064" />
-<TGConnectingPoint num="51" id="1065" />
-<TGConnectingPoint num="52" id="1066" />
-<TGConnectingPoint num="53" id="1067" />
-<TGConnectingPoint num="54" id="1068" />
-<TGConnectingPoint num="55" id="1069" />
-<TGConnectingPoint num="56" id="1070" />
-<TGConnectingPoint num="57" id="1071" />
-<TGConnectingPoint num="58" id="1072" />
-<TGConnectingPoint num="59" id="1073" />
-<TGConnectingPoint num="60" id="1074" />
-<TGConnectingPoint num="61" id="1075" />
-<TGConnectingPoint num="62" id="1076" />
-<TGConnectingPoint num="63" id="1077" />
-<TGConnectingPoint num="64" id="1078" />
-<TGConnectingPoint num="65" id="1079" />
-<TGConnectingPoint num="66" id="1080" />
-<TGConnectingPoint num="67" id="1081" />
-<TGConnectingPoint num="68" id="1082" />
-<TGConnectingPoint num="69" id="1083" />
-<TGConnectingPoint num="70" id="1084" />
-<TGConnectingPoint num="71" id="1085" />
+<TGConnectingPoint num="0" id="1006" />
+<TGConnectingPoint num="1" id="1007" />
+<TGConnectingPoint num="2" id="1008" />
+<TGConnectingPoint num="3" id="1009" />
+<TGConnectingPoint num="4" id="1010" />
+<TGConnectingPoint num="5" id="1011" />
+<TGConnectingPoint num="6" id="1012" />
+<TGConnectingPoint num="7" id="1013" />
+<TGConnectingPoint num="8" id="1014" />
+<TGConnectingPoint num="9" id="1015" />
+<TGConnectingPoint num="10" id="1016" />
+<TGConnectingPoint num="11" id="1017" />
+<TGConnectingPoint num="12" id="1018" />
+<TGConnectingPoint num="13" id="1019" />
+<TGConnectingPoint num="14" id="1020" />
+<TGConnectingPoint num="15" id="1021" />
+<TGConnectingPoint num="16" id="1022" />
+<TGConnectingPoint num="17" id="1023" />
+<TGConnectingPoint num="18" id="1024" />
+<TGConnectingPoint num="19" id="1025" />
+<TGConnectingPoint num="20" id="1026" />
+<TGConnectingPoint num="21" id="1027" />
+<TGConnectingPoint num="22" id="1028" />
+<TGConnectingPoint num="23" id="1029" />
+<TGConnectingPoint num="24" id="1030" />
+<TGConnectingPoint num="25" id="1031" />
+<TGConnectingPoint num="26" id="1032" />
+<TGConnectingPoint num="27" id="1033" />
+<TGConnectingPoint num="28" id="1034" />
+<TGConnectingPoint num="29" id="1035" />
+<TGConnectingPoint num="30" id="1036" />
+<TGConnectingPoint num="31" id="1037" />
+<TGConnectingPoint num="32" id="1038" />
+<TGConnectingPoint num="33" id="1039" />
+<TGConnectingPoint num="34" id="1040" />
+<TGConnectingPoint num="35" id="1041" />
+<TGConnectingPoint num="36" id="1042" />
+<TGConnectingPoint num="37" id="1043" />
+<TGConnectingPoint num="38" id="1044" />
+<TGConnectingPoint num="39" id="1045" />
+<TGConnectingPoint num="40" id="1046" />
+<TGConnectingPoint num="41" id="1047" />
+<TGConnectingPoint num="42" id="1048" />
+<TGConnectingPoint num="43" id="1049" />
+<TGConnectingPoint num="44" id="1050" />
+<TGConnectingPoint num="45" id="1051" />
+<TGConnectingPoint num="46" id="1052" />
+<TGConnectingPoint num="47" id="1053" />
+<TGConnectingPoint num="48" id="1054" />
+<TGConnectingPoint num="49" id="1055" />
+<TGConnectingPoint num="50" id="1056" />
+<TGConnectingPoint num="51" id="1057" />
+<TGConnectingPoint num="52" id="1058" />
+<TGConnectingPoint num="53" id="1059" />
+<TGConnectingPoint num="54" id="1060" />
+<TGConnectingPoint num="55" id="1061" />
+<TGConnectingPoint num="56" id="1062" />
+<TGConnectingPoint num="57" id="1063" />
+<TGConnectingPoint num="58" id="1064" />
+<TGConnectingPoint num="59" id="1065" />
+<TGConnectingPoint num="60" id="1066" />
+<TGConnectingPoint num="61" id="1067" />
+<TGConnectingPoint num="62" id="1068" />
+<TGConnectingPoint num="63" id="1069" />
+<TGConnectingPoint num="64" id="1070" />
+<TGConnectingPoint num="65" id="1071" />
+<TGConnectingPoint num="66" id="1072" />
+<TGConnectingPoint num="67" id="1073" />
+<TGConnectingPoint num="68" id="1074" />
+<TGConnectingPoint num="69" id="1075" />
+<TGConnectingPoint num="70" id="1076" />
+<TGConnectingPoint num="71" id="1077" />
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5103" id="1011" >
-<father id="1086" num="0" />
+<SUBCOMPONENT type="5103" id="1003" >
+<father id="1078" num="0" />
 <cdparam x="330" y="257" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
 <infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1001" />
-<TGConnectingPoint num="1" id="1002" />
-<TGConnectingPoint num="2" id="1003" />
-<TGConnectingPoint num="3" id="1004" />
-<TGConnectingPoint num="4" id="1005" />
-<TGConnectingPoint num="5" id="1006" />
-<TGConnectingPoint num="6" id="1007" />
-<TGConnectingPoint num="7" id="1008" />
-<TGConnectingPoint num="8" id="1009" />
-<TGConnectingPoint num="9" id="1010" />
+<TGConnectingPoint num="0" id="993" />
+<TGConnectingPoint num="1" id="994" />
+<TGConnectingPoint num="2" id="995" />
+<TGConnectingPoint num="3" id="996" />
+<TGConnectingPoint num="4" id="997" />
+<TGConnectingPoint num="5" id="998" />
+<TGConnectingPoint num="6" id="999" />
+<TGConnectingPoint num="7" id="1000" />
+<TGConnectingPoint num="8" id="1001" />
+<TGConnectingPoint num="9" id="1002" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1013" >
-<father id="1086" num="1" />
+<SUBCOMPONENT type="5100" id="1005" >
+<father id="1078" num="1" />
 <cdparam x="333" y="213" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1012" />
+<TGConnectingPoint num="0" id="1004" />
 </SUBCOMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="TeaButton" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1093" >
+<CONNECTOR type="5102" id="1085" >
 <cdparam x="363" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1092" />
-<P1  x="363" y="204" id="1109" />
-<P2  x="362" y="257" id="1120" />
+<TGConnectingPoint num="0" id="1084" />
+<P1  x="363" y="204" id="1101" />
+<P2  x="362" y="257" id="1112" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1091" >
-<father id="1093" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1083" >
+<father id="1085" num="0" />
 <cdparam x="380" y="228" />
 <sizeparam width="145" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1087" />
-<TGConnectingPoint num="1" id="1088" />
-<TGConnectingPoint num="2" id="1089" />
-<TGConnectingPoint num="3" id="1090" />
+<TGConnectingPoint num="0" id="1079" />
+<TGConnectingPoint num="1" id="1080" />
+<TGConnectingPoint num="2" id="1081" />
+<TGConnectingPoint num="3" id="1082" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="mechanicalDelay" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1100" >
+<CONNECTOR type="5102" id="1092" >
 <cdparam x="363" y="150" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1099" />
-<P1  x="363" y="150" id="1198" />
-<P2  x="363" y="174" id="1108" />
+<TGConnectingPoint num="0" id="1091" />
+<P1  x="363" y="150" id="1190" />
+<P2  x="363" y="174" id="1100" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1098" >
-<father id="1100" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1090" >
+<father id="1092" num="0" />
 <cdparam x="363" y="190" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1094" />
-<TGConnectingPoint num="1" id="1095" />
-<TGConnectingPoint num="2" id="1096" />
-<TGConnectingPoint num="3" id="1097" />
+<TGConnectingPoint num="0" id="1086" />
+<TGConnectingPoint num="1" id="1087" />
+<TGConnectingPoint num="2" id="1088" />
+<TGConnectingPoint num="3" id="1089" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1107" >
+<CONNECTOR type="5102" id="1099" >
 <cdparam x="362" y="101" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1106" />
-<P1  x="362" y="101" id="1265" />
-<P2  x="363" y="120" id="1193" />
+<TGConnectingPoint num="0" id="1098" />
+<P1  x="362" y="101" id="1257" />
+<P2  x="363" y="120" id="1185" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1105" >
-<father id="1107" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1097" >
+<father id="1099" num="0" />
 <cdparam x="362" y="141" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1101" />
-<TGConnectingPoint num="1" id="1102" />
-<TGConnectingPoint num="2" id="1103" />
-<TGConnectingPoint num="3" id="1104" />
+<TGConnectingPoint num="0" id="1093" />
+<TGConnectingPoint num="1" id="1094" />
+<TGConnectingPoint num="2" id="1095" />
+<TGConnectingPoint num="3" id="1096" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="1118" >
+<COMPONENT type="5103" id="1110" >
 <cdparam x="340" y="179" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1108" />
-<TGConnectingPoint num="1" id="1109" />
-<TGConnectingPoint num="2" id="1110" />
-<TGConnectingPoint num="3" id="1111" />
-<TGConnectingPoint num="4" id="1112" />
-<TGConnectingPoint num="5" id="1113" />
-<TGConnectingPoint num="6" id="1114" />
-<TGConnectingPoint num="7" id="1115" />
-<TGConnectingPoint num="8" id="1116" />
-<TGConnectingPoint num="9" id="1117" />
+<TGConnectingPoint num="0" id="1100" />
+<TGConnectingPoint num="1" id="1101" />
+<TGConnectingPoint num="2" id="1102" />
+<TGConnectingPoint num="3" id="1103" />
+<TGConnectingPoint num="4" id="1104" />
+<TGConnectingPoint num="5" id="1105" />
+<TGConnectingPoint num="6" id="1106" />
+<TGConnectingPoint num="7" id="1107" />
+<TGConnectingPoint num="8" id="1108" />
+<TGConnectingPoint num="9" id="1109" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1191" >
+<COMPONENT type="5106" id="1183" >
 <cdparam x="337" y="257" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1119" />
-<TGConnectingPoint num="1" id="1120" />
-<TGConnectingPoint num="2" id="1121" />
-<TGConnectingPoint num="3" id="1122" />
-<TGConnectingPoint num="4" id="1123" />
-<TGConnectingPoint num="5" id="1124" />
-<TGConnectingPoint num="6" id="1125" />
-<TGConnectingPoint num="7" id="1126" />
-<TGConnectingPoint num="8" id="1127" />
-<TGConnectingPoint num="9" id="1128" />
-<TGConnectingPoint num="10" id="1129" />
-<TGConnectingPoint num="11" id="1130" />
-<TGConnectingPoint num="12" id="1131" />
-<TGConnectingPoint num="13" id="1132" />
-<TGConnectingPoint num="14" id="1133" />
-<TGConnectingPoint num="15" id="1134" />
-<TGConnectingPoint num="16" id="1135" />
-<TGConnectingPoint num="17" id="1136" />
-<TGConnectingPoint num="18" id="1137" />
-<TGConnectingPoint num="19" id="1138" />
-<TGConnectingPoint num="20" id="1139" />
-<TGConnectingPoint num="21" id="1140" />
-<TGConnectingPoint num="22" id="1141" />
-<TGConnectingPoint num="23" id="1142" />
-<TGConnectingPoint num="24" id="1143" />
-<TGConnectingPoint num="25" id="1144" />
-<TGConnectingPoint num="26" id="1145" />
-<TGConnectingPoint num="27" id="1146" />
-<TGConnectingPoint num="28" id="1147" />
-<TGConnectingPoint num="29" id="1148" />
-<TGConnectingPoint num="30" id="1149" />
-<TGConnectingPoint num="31" id="1150" />
-<TGConnectingPoint num="32" id="1151" />
-<TGConnectingPoint num="33" id="1152" />
-<TGConnectingPoint num="34" id="1153" />
-<TGConnectingPoint num="35" id="1154" />
-<TGConnectingPoint num="36" id="1155" />
-<TGConnectingPoint num="37" id="1156" />
-<TGConnectingPoint num="38" id="1157" />
-<TGConnectingPoint num="39" id="1158" />
-<TGConnectingPoint num="40" id="1159" />
-<TGConnectingPoint num="41" id="1160" />
-<TGConnectingPoint num="42" id="1161" />
-<TGConnectingPoint num="43" id="1162" />
-<TGConnectingPoint num="44" id="1163" />
-<TGConnectingPoint num="45" id="1164" />
-<TGConnectingPoint num="46" id="1165" />
-<TGConnectingPoint num="47" id="1166" />
-<TGConnectingPoint num="48" id="1167" />
-<TGConnectingPoint num="49" id="1168" />
-<TGConnectingPoint num="50" id="1169" />
-<TGConnectingPoint num="51" id="1170" />
-<TGConnectingPoint num="52" id="1171" />
-<TGConnectingPoint num="53" id="1172" />
-<TGConnectingPoint num="54" id="1173" />
-<TGConnectingPoint num="55" id="1174" />
-<TGConnectingPoint num="56" id="1175" />
-<TGConnectingPoint num="57" id="1176" />
-<TGConnectingPoint num="58" id="1177" />
-<TGConnectingPoint num="59" id="1178" />
-<TGConnectingPoint num="60" id="1179" />
-<TGConnectingPoint num="61" id="1180" />
-<TGConnectingPoint num="62" id="1181" />
-<TGConnectingPoint num="63" id="1182" />
-<TGConnectingPoint num="64" id="1183" />
-<TGConnectingPoint num="65" id="1184" />
-<TGConnectingPoint num="66" id="1185" />
-<TGConnectingPoint num="67" id="1186" />
-<TGConnectingPoint num="68" id="1187" />
-<TGConnectingPoint num="69" id="1188" />
-<TGConnectingPoint num="70" id="1189" />
-<TGConnectingPoint num="71" id="1190" />
+<TGConnectingPoint num="0" id="1111" />
+<TGConnectingPoint num="1" id="1112" />
+<TGConnectingPoint num="2" id="1113" />
+<TGConnectingPoint num="3" id="1114" />
+<TGConnectingPoint num="4" id="1115" />
+<TGConnectingPoint num="5" id="1116" />
+<TGConnectingPoint num="6" id="1117" />
+<TGConnectingPoint num="7" id="1118" />
+<TGConnectingPoint num="8" id="1119" />
+<TGConnectingPoint num="9" id="1120" />
+<TGConnectingPoint num="10" id="1121" />
+<TGConnectingPoint num="11" id="1122" />
+<TGConnectingPoint num="12" id="1123" />
+<TGConnectingPoint num="13" id="1124" />
+<TGConnectingPoint num="14" id="1125" />
+<TGConnectingPoint num="15" id="1126" />
+<TGConnectingPoint num="16" id="1127" />
+<TGConnectingPoint num="17" id="1128" />
+<TGConnectingPoint num="18" id="1129" />
+<TGConnectingPoint num="19" id="1130" />
+<TGConnectingPoint num="20" id="1131" />
+<TGConnectingPoint num="21" id="1132" />
+<TGConnectingPoint num="22" id="1133" />
+<TGConnectingPoint num="23" id="1134" />
+<TGConnectingPoint num="24" id="1135" />
+<TGConnectingPoint num="25" id="1136" />
+<TGConnectingPoint num="26" id="1137" />
+<TGConnectingPoint num="27" id="1138" />
+<TGConnectingPoint num="28" id="1139" />
+<TGConnectingPoint num="29" id="1140" />
+<TGConnectingPoint num="30" id="1141" />
+<TGConnectingPoint num="31" id="1142" />
+<TGConnectingPoint num="32" id="1143" />
+<TGConnectingPoint num="33" id="1144" />
+<TGConnectingPoint num="34" id="1145" />
+<TGConnectingPoint num="35" id="1146" />
+<TGConnectingPoint num="36" id="1147" />
+<TGConnectingPoint num="37" id="1148" />
+<TGConnectingPoint num="38" id="1149" />
+<TGConnectingPoint num="39" id="1150" />
+<TGConnectingPoint num="40" id="1151" />
+<TGConnectingPoint num="41" id="1152" />
+<TGConnectingPoint num="42" id="1153" />
+<TGConnectingPoint num="43" id="1154" />
+<TGConnectingPoint num="44" id="1155" />
+<TGConnectingPoint num="45" id="1156" />
+<TGConnectingPoint num="46" id="1157" />
+<TGConnectingPoint num="47" id="1158" />
+<TGConnectingPoint num="48" id="1159" />
+<TGConnectingPoint num="49" id="1160" />
+<TGConnectingPoint num="50" id="1161" />
+<TGConnectingPoint num="51" id="1162" />
+<TGConnectingPoint num="52" id="1163" />
+<TGConnectingPoint num="53" id="1164" />
+<TGConnectingPoint num="54" id="1165" />
+<TGConnectingPoint num="55" id="1166" />
+<TGConnectingPoint num="56" id="1167" />
+<TGConnectingPoint num="57" id="1168" />
+<TGConnectingPoint num="58" id="1169" />
+<TGConnectingPoint num="59" id="1170" />
+<TGConnectingPoint num="60" id="1171" />
+<TGConnectingPoint num="61" id="1172" />
+<TGConnectingPoint num="62" id="1173" />
+<TGConnectingPoint num="63" id="1174" />
+<TGConnectingPoint num="64" id="1175" />
+<TGConnectingPoint num="65" id="1176" />
+<TGConnectingPoint num="66" id="1177" />
+<TGConnectingPoint num="67" id="1178" />
+<TGConnectingPoint num="68" id="1179" />
+<TGConnectingPoint num="69" id="1180" />
+<TGConnectingPoint num="70" id="1181" />
+<TGConnectingPoint num="71" id="1182" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1264" >
+<COMPONENT type="5106" id="1256" >
 <cdparam x="338" y="120" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="1192" />
-<TGConnectingPoint num="1" id="1193" />
-<TGConnectingPoint num="2" id="1194" />
-<TGConnectingPoint num="3" id="1195" />
-<TGConnectingPoint num="4" id="1196" />
-<TGConnectingPoint num="5" id="1197" />
-<TGConnectingPoint num="6" id="1198" />
-<TGConnectingPoint num="7" id="1199" />
-<TGConnectingPoint num="8" id="1200" />
-<TGConnectingPoint num="9" id="1201" />
-<TGConnectingPoint num="10" id="1202" />
-<TGConnectingPoint num="11" id="1203" />
-<TGConnectingPoint num="12" id="1204" />
-<TGConnectingPoint num="13" id="1205" />
-<TGConnectingPoint num="14" id="1206" />
-<TGConnectingPoint num="15" id="1207" />
-<TGConnectingPoint num="16" id="1208" />
-<TGConnectingPoint num="17" id="1209" />
-<TGConnectingPoint num="18" id="1210" />
-<TGConnectingPoint num="19" id="1211" />
-<TGConnectingPoint num="20" id="1212" />
-<TGConnectingPoint num="21" id="1213" />
-<TGConnectingPoint num="22" id="1214" />
-<TGConnectingPoint num="23" id="1215" />
-<TGConnectingPoint num="24" id="1216" />
-<TGConnectingPoint num="25" id="1217" />
-<TGConnectingPoint num="26" id="1218" />
-<TGConnectingPoint num="27" id="1219" />
-<TGConnectingPoint num="28" id="1220" />
-<TGConnectingPoint num="29" id="1221" />
-<TGConnectingPoint num="30" id="1222" />
-<TGConnectingPoint num="31" id="1223" />
-<TGConnectingPoint num="32" id="1224" />
-<TGConnectingPoint num="33" id="1225" />
-<TGConnectingPoint num="34" id="1226" />
-<TGConnectingPoint num="35" id="1227" />
-<TGConnectingPoint num="36" id="1228" />
-<TGConnectingPoint num="37" id="1229" />
-<TGConnectingPoint num="38" id="1230" />
-<TGConnectingPoint num="39" id="1231" />
-<TGConnectingPoint num="40" id="1232" />
-<TGConnectingPoint num="41" id="1233" />
-<TGConnectingPoint num="42" id="1234" />
-<TGConnectingPoint num="43" id="1235" />
-<TGConnectingPoint num="44" id="1236" />
-<TGConnectingPoint num="45" id="1237" />
-<TGConnectingPoint num="46" id="1238" />
-<TGConnectingPoint num="47" id="1239" />
-<TGConnectingPoint num="48" id="1240" />
-<TGConnectingPoint num="49" id="1241" />
-<TGConnectingPoint num="50" id="1242" />
-<TGConnectingPoint num="51" id="1243" />
-<TGConnectingPoint num="52" id="1244" />
-<TGConnectingPoint num="53" id="1245" />
-<TGConnectingPoint num="54" id="1246" />
-<TGConnectingPoint num="55" id="1247" />
-<TGConnectingPoint num="56" id="1248" />
-<TGConnectingPoint num="57" id="1249" />
-<TGConnectingPoint num="58" id="1250" />
-<TGConnectingPoint num="59" id="1251" />
-<TGConnectingPoint num="60" id="1252" />
-<TGConnectingPoint num="61" id="1253" />
-<TGConnectingPoint num="62" id="1254" />
-<TGConnectingPoint num="63" id="1255" />
-<TGConnectingPoint num="64" id="1256" />
-<TGConnectingPoint num="65" id="1257" />
-<TGConnectingPoint num="66" id="1258" />
-<TGConnectingPoint num="67" id="1259" />
-<TGConnectingPoint num="68" id="1260" />
-<TGConnectingPoint num="69" id="1261" />
-<TGConnectingPoint num="70" id="1262" />
-<TGConnectingPoint num="71" id="1263" />
+<TGConnectingPoint num="0" id="1184" />
+<TGConnectingPoint num="1" id="1185" />
+<TGConnectingPoint num="2" id="1186" />
+<TGConnectingPoint num="3" id="1187" />
+<TGConnectingPoint num="4" id="1188" />
+<TGConnectingPoint num="5" id="1189" />
+<TGConnectingPoint num="6" id="1190" />
+<TGConnectingPoint num="7" id="1191" />
+<TGConnectingPoint num="8" id="1192" />
+<TGConnectingPoint num="9" id="1193" />
+<TGConnectingPoint num="10" id="1194" />
+<TGConnectingPoint num="11" id="1195" />
+<TGConnectingPoint num="12" id="1196" />
+<TGConnectingPoint num="13" id="1197" />
+<TGConnectingPoint num="14" id="1198" />
+<TGConnectingPoint num="15" id="1199" />
+<TGConnectingPoint num="16" id="1200" />
+<TGConnectingPoint num="17" id="1201" />
+<TGConnectingPoint num="18" id="1202" />
+<TGConnectingPoint num="19" id="1203" />
+<TGConnectingPoint num="20" id="1204" />
+<TGConnectingPoint num="21" id="1205" />
+<TGConnectingPoint num="22" id="1206" />
+<TGConnectingPoint num="23" id="1207" />
+<TGConnectingPoint num="24" id="1208" />
+<TGConnectingPoint num="25" id="1209" />
+<TGConnectingPoint num="26" id="1210" />
+<TGConnectingPoint num="27" id="1211" />
+<TGConnectingPoint num="28" id="1212" />
+<TGConnectingPoint num="29" id="1213" />
+<TGConnectingPoint num="30" id="1214" />
+<TGConnectingPoint num="31" id="1215" />
+<TGConnectingPoint num="32" id="1216" />
+<TGConnectingPoint num="33" id="1217" />
+<TGConnectingPoint num="34" id="1218" />
+<TGConnectingPoint num="35" id="1219" />
+<TGConnectingPoint num="36" id="1220" />
+<TGConnectingPoint num="37" id="1221" />
+<TGConnectingPoint num="38" id="1222" />
+<TGConnectingPoint num="39" id="1223" />
+<TGConnectingPoint num="40" id="1224" />
+<TGConnectingPoint num="41" id="1225" />
+<TGConnectingPoint num="42" id="1226" />
+<TGConnectingPoint num="43" id="1227" />
+<TGConnectingPoint num="44" id="1228" />
+<TGConnectingPoint num="45" id="1229" />
+<TGConnectingPoint num="46" id="1230" />
+<TGConnectingPoint num="47" id="1231" />
+<TGConnectingPoint num="48" id="1232" />
+<TGConnectingPoint num="49" id="1233" />
+<TGConnectingPoint num="50" id="1234" />
+<TGConnectingPoint num="51" id="1235" />
+<TGConnectingPoint num="52" id="1236" />
+<TGConnectingPoint num="53" id="1237" />
+<TGConnectingPoint num="54" id="1238" />
+<TGConnectingPoint num="55" id="1239" />
+<TGConnectingPoint num="56" id="1240" />
+<TGConnectingPoint num="57" id="1241" />
+<TGConnectingPoint num="58" id="1242" />
+<TGConnectingPoint num="59" id="1243" />
+<TGConnectingPoint num="60" id="1244" />
+<TGConnectingPoint num="61" id="1245" />
+<TGConnectingPoint num="62" id="1246" />
+<TGConnectingPoint num="63" id="1247" />
+<TGConnectingPoint num="64" id="1248" />
+<TGConnectingPoint num="65" id="1249" />
+<TGConnectingPoint num="66" id="1250" />
+<TGConnectingPoint num="67" id="1251" />
+<TGConnectingPoint num="68" id="1252" />
+<TGConnectingPoint num="69" id="1253" />
+<TGConnectingPoint num="70" id="1254" />
+<TGConnectingPoint num="71" id="1255" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1266" >
+<COMPONENT type="5100" id="1258" >
 <cdparam x="355" y="81" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1265" />
+<TGConnectingPoint num="0" id="1257" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="CoffeeMachine" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="118" id="1267" >
+<CONNECTOR type="118" id="1259" >
 <cdparam x="372" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="412" y="82" id="1607" />
-<P2  x="472" y="82" id="1376" />
+<P1  x="412" y="82" id="1599" />
+<P2  x="472" y="82" id="1368" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="1274" >
+<CONNECTOR type="5102" id="1266" >
 <cdparam x="691" y="288" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1273" />
-<P1  x="699" y="289" id="1429" />
-<P2  x="699" y="316" id="1401" />
+<TGConnectingPoint num="0" id="1265" />
+<P1  x="699" y="289" id="1421" />
+<P2  x="699" y="316" id="1393" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1272" >
-<father id="1274" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1264" >
+<father id="1266" num="0" />
 <cdparam x="691" y="328" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1268" />
-<TGConnectingPoint num="1" id="1269" />
-<TGConnectingPoint num="2" id="1270" />
-<TGConnectingPoint num="3" id="1271" />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<TGConnectingPoint num="2" id="1262" />
+<TGConnectingPoint num="3" id="1263" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1281" >
+<CONNECTOR type="5102" id="1273" >
 <cdparam x="481" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1280" />
-<P1  x="442" y="527" id="1888" />
-<P2  x="323" y="748" id="1653" />
+<TGConnectingPoint num="0" id="1272" />
+<P1  x="442" y="527" id="1880" />
+<P2  x="323" y="748" id="1645" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1279" >
-<father id="1281" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1271" >
+<father id="1273" num="0" />
 <cdparam x="420" y="552" />
 <sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1275" />
-<TGConnectingPoint num="1" id="1276" />
-<TGConnectingPoint num="2" id="1277" />
-<TGConnectingPoint num="3" id="1278" />
+<TGConnectingPoint num="0" id="1267" />
+<TGConnectingPoint num="1" id="1268" />
+<TGConnectingPoint num="2" id="1269" />
+<TGConnectingPoint num="3" id="1270" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2264,60 +2324,64 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1288" >
+<CONNECTOR type="5102" id="1280" >
 <cdparam x="555" y="559" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1287" />
-<P1  x="326" y="457" id="1805" />
-<P2  x="442" y="497" id="1887" />
+<TGConnectingPoint num="0" id="1279" />
+<P1  x="326" y="457" id="1797" />
+<P2  x="442" y="497" id="1879" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1286" >
-<father id="1288" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1278" >
+<father id="1280" num="0" />
 <cdparam x="395" y="448" />
 <sizeparam width="100" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1282" />
-<TGConnectingPoint num="1" id="1283" />
-<TGConnectingPoint num="2" id="1284" />
-<TGConnectingPoint num="3" id="1285" />
+<TGConnectingPoint num="0" id="1274" />
+<TGConnectingPoint num="1" id="1275" />
+<TGConnectingPoint num="2" id="1276" />
+<TGConnectingPoint num="3" id="1277" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="coinDelay" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1295" >
+<CONNECTOR type="5102" id="1287" >
 <cdparam x="355" y="545" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1294" />
-<P1  x="298" y="554" id="1791" />
-<P2  x="289" y="748" id="1645" />
+<TGConnectingPoint num="0" id="1286" />
+<P1  x="298" y="554" id="1783" />
+<P2  x="289" y="748" id="1637" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1293" >
-<father id="1295" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1285" >
+<father id="1287" num="0" />
 <cdparam x="284" y="594" />
 <sizeparam width="252" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1289" />
-<TGConnectingPoint num="1" id="1290" />
-<TGConnectingPoint num="2" id="1291" />
-<TGConnectingPoint num="3" id="1292" />
+<TGConnectingPoint num="0" id="1281" />
+<TGConnectingPoint num="1" id="1282" />
+<TGConnectingPoint num="2" id="1283" />
+<TGConnectingPoint num="3" id="1284" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="teaMinDelay" enabled="true"/>
 <computeMax value="teaMaxDelay" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2326,60 +2390,64 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1302" >
+<CONNECTOR type="5102" id="1294" >
 <cdparam x="295" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1301" />
-<P1  x="293" y="477" id="1816" />
-<P2  x="298" y="524" id="1790" />
+<TGConnectingPoint num="0" id="1293" />
+<P1  x="293" y="477" id="1808" />
+<P2  x="298" y="524" id="1782" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1300" >
-<father id="1302" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1292" >
+<father id="1294" num="0" />
 <cdparam x="295" y="505" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1296" />
-<TGConnectingPoint num="1" id="1297" />
-<TGConnectingPoint num="2" id="1298" />
-<TGConnectingPoint num="3" id="1299" />
+<TGConnectingPoint num="0" id="1288" />
+<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="2" id="1290" />
+<TGConnectingPoint num="3" id="1291" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1309" >
+<CONNECTOR type="5102" id="1301" >
 <cdparam x="148" y="549" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1308" />
-<P1  x="126" y="554" id="1877" />
-<P2  x="255" y="748" id="1652" />
+<TGConnectingPoint num="0" id="1300" />
+<P1  x="126" y="554" id="1869" />
+<P2  x="255" y="748" id="1644" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1307" >
-<father id="1309" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1299" >
+<father id="1301" num="0" />
 <cdparam x="32" y="587" />
 <sizeparam width="288" height="45" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1303" />
-<TGConnectingPoint num="1" id="1304" />
-<TGConnectingPoint num="2" id="1305" />
-<TGConnectingPoint num="3" id="1306" />
+<TGConnectingPoint num="0" id="1295" />
+<TGConnectingPoint num="1" id="1296" />
+<TGConnectingPoint num="2" id="1297" />
+<TGConnectingPoint num="3" id="1298" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="coffeeMinDelay" enabled="true"/>
 <computeMax value="coffeeMaxDelay" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2388,90 +2456,96 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1316" >
+<CONNECTOR type="5102" id="1308" >
 <cdparam x="229" y="465" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1315" />
-<P1  x="227" y="477" id="1815" />
-<P2  x="126" y="524" id="1876" />
+<TGConnectingPoint num="0" id="1307" />
+<P1  x="227" y="477" id="1807" />
+<P2  x="126" y="524" id="1868" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1314" >
-<father id="1316" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1306" >
+<father id="1308" num="0" />
 <cdparam x="229" y="505" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1310" />
-<TGConnectingPoint num="1" id="1311" />
-<TGConnectingPoint num="2" id="1312" />
-<TGConnectingPoint num="3" id="1313" />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<TGConnectingPoint num="2" id="1304" />
+<TGConnectingPoint num="3" id="1305" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1323" >
+<CONNECTOR type="5102" id="1315" >
 <cdparam x="280" y="420" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1322" />
-<P1  x="261" y="421" id="1874" />
-<P2  x="260" y="437" id="1802" />
+<TGConnectingPoint num="0" id="1314" />
+<P1  x="261" y="421" id="1866" />
+<P2  x="260" y="437" id="1794" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1321" >
-<father id="1323" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1313" >
+<father id="1315" num="0" />
 <cdparam x="280" y="460" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1317" />
-<TGConnectingPoint num="1" id="1318" />
-<TGConnectingPoint num="2" id="1319" />
-<TGConnectingPoint num="3" id="1320" />
+<TGConnectingPoint num="0" id="1309" />
+<TGConnectingPoint num="1" id="1310" />
+<TGConnectingPoint num="2" id="1311" />
+<TGConnectingPoint num="3" id="1312" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1330" >
+<CONNECTOR type="5102" id="1322" >
 <cdparam x="667" y="346" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1329" />
-<P1  x="699" y="346" id="1402" />
-<P2  x="699" y="381" id="1718" />
+<TGConnectingPoint num="0" id="1321" />
+<P1  x="699" y="346" id="1394" />
+<P2  x="699" y="381" id="1710" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1328" >
-<father id="1330" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1320" >
+<father id="1322" num="0" />
 <cdparam x="707" y="368" />
 <sizeparam width="89" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1324" />
-<TGConnectingPoint num="1" id="1325" />
-<TGConnectingPoint num="2" id="1326" />
-<TGConnectingPoint num="3" id="1327" />
+<TGConnectingPoint num="0" id="1316" />
+<TGConnectingPoint num="1" id="1317" />
+<TGConnectingPoint num="2" id="1318" />
+<TGConnectingPoint num="3" id="1319" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2479,120 +2553,129 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1337" >
+<CONNECTOR type="5102" id="1329" >
 <cdparam x="348" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1336" />
-<P1  x="388" y="208" id="1500" />
-<P2  x="649" y="264" id="1426" />
+<TGConnectingPoint num="0" id="1328" />
+<P1  x="388" y="208" id="1492" />
+<P2  x="649" y="264" id="1418" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1335" >
-<father id="1337" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1327" >
+<father id="1329" num="0" />
 <cdparam x="411" y="206" />
 <sizeparam width="100" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1331" />
-<TGConnectingPoint num="1" id="1332" />
-<TGConnectingPoint num="2" id="1333" />
-<TGConnectingPoint num="3" id="1334" />
+<TGConnectingPoint num="0" id="1323" />
+<TGConnectingPoint num="1" id="1324" />
+<TGConnectingPoint num="2" id="1325" />
+<TGConnectingPoint num="3" id="1326" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="coinDelay" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="0.1" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1344" >
+<CONNECTOR type="5102" id="1336" >
 <cdparam x="243" y="319" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1343" />
-<P1  x="277" y="305" id="1413" />
-<P2  x="311" y="372" id="1899" />
+<TGConnectingPoint num="0" id="1335" />
+<P1  x="277" y="305" id="1405" />
+<P2  x="311" y="372" id="1891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1342" >
-<father id="1344" num="0" />
-<cdparam x="243" y="359" />
-<sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1334" >
+<father id="1336" num="0" />
+<cdparam x="291" y="348" />
+<sizeparam width="85" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1338" />
-<TGConnectingPoint num="1" id="1339" />
-<TGConnectingPoint num="2" id="1340" />
-<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="0" id="1330" />
+<TGConnectingPoint num="1" id="1331" />
+<TGConnectingPoint num="2" id="1332" />
+<TGConnectingPoint num="3" id="1333" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="nbOfCoins = 2" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1351" >
+<CONNECTOR type="5102" id="1343" >
 <cdparam x="270" y="224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1350" />
-<P1  x="270" y="228" id="1510" />
-<P2  x="277" y="275" id="1412" />
+<TGConnectingPoint num="0" id="1342" />
+<P1  x="270" y="228" id="1502" />
+<P2  x="277" y="275" id="1404" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1349" >
-<father id="1351" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1341" >
+<father id="1343" num="0" />
 <cdparam x="270" y="264" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
-<TGConnectingPoint num="2" id="1347" />
-<TGConnectingPoint num="3" id="1348" />
+<TGConnectingPoint num="0" id="1337" />
+<TGConnectingPoint num="1" id="1338" />
+<TGConnectingPoint num="2" id="1339" />
+<TGConnectingPoint num="3" id="1340" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1358" >
+<CONNECTOR type="5102" id="1350" >
 <cdparam x="309" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1357" />
-<P1  x="306" y="166" id="1391" />
-<P2  x="309" y="188" id="1497" />
+<TGConnectingPoint num="0" id="1349" />
+<P1  x="306" y="166" id="1383" />
+<P2  x="309" y="188" id="1489" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1356" >
-<father id="1358" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1348" >
+<father id="1350" num="0" />
 <cdparam x="328" y="178" />
 <sizeparam width="168" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1352" />
-<TGConnectingPoint num="1" id="1353" />
-<TGConnectingPoint num="2" id="1354" />
-<TGConnectingPoint num="3" id="1355" />
+<TGConnectingPoint num="0" id="1344" />
+<TGConnectingPoint num="1" id="1345" />
+<TGConnectingPoint num="2" id="1346" />
+<TGConnectingPoint num="3" id="1347" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -2600,810 +2683,814 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1365" >
+<CONNECTOR type="5102" id="1357" >
 <cdparam x="303" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1364" />
-<P1  x="302" y="102" id="1577" />
-<P2  x="306" y="136" id="1390" />
+<TGConnectingPoint num="0" id="1356" />
+<P1  x="302" y="102" id="1569" />
+<P2  x="306" y="136" id="1382" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1363" >
-<father id="1365" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1355" >
+<father id="1357" num="0" />
 <cdparam x="303" y="143" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1359" />
-<TGConnectingPoint num="1" id="1360" />
-<TGConnectingPoint num="2" id="1361" />
-<TGConnectingPoint num="3" id="1362" />
+<TGConnectingPoint num="0" id="1351" />
+<TGConnectingPoint num="1" id="1352" />
+<TGConnectingPoint num="2" id="1353" />
+<TGConnectingPoint num="3" id="1354" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1372" >
+<CONNECTOR type="5102" id="1364" >
 <cdparam x="303" y="40" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1371" />
-<P1  x="303" y="40" id="1569" />
-<P2  x="302" y="62" id="1572" />
+<TGConnectingPoint num="0" id="1363" />
+<P1  x="303" y="40" id="1561" />
+<P2  x="302" y="62" id="1564" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1370" >
-<father id="1372" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1362" >
+<father id="1364" num="0" />
 <cdparam x="303" y="80" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1366" />
-<TGConnectingPoint num="1" id="1367" />
-<TGConnectingPoint num="2" id="1368" />
-<TGConnectingPoint num="3" id="1369" />
+<TGConnectingPoint num="0" id="1358" />
+<TGConnectingPoint num="1" id="1359" />
+<TGConnectingPoint num="2" id="1360" />
+<TGConnectingPoint num="3" id="1361" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="1389" >
+<COMPONENT type="301" id="1381" >
 <cdparam x="472" y="75" />
 <sizeparam width="100" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="UML Note" value="Activity1.docx
 " />
-<TGConnectingPoint num="0" id="1373" />
-<TGConnectingPoint num="1" id="1374" />
-<TGConnectingPoint num="2" id="1375" />
-<TGConnectingPoint num="3" id="1376" />
-<TGConnectingPoint num="4" id="1377" />
-<TGConnectingPoint num="5" id="1378" />
-<TGConnectingPoint num="6" id="1379" />
-<TGConnectingPoint num="7" id="1380" />
-<TGConnectingPoint num="8" id="1381" />
-<TGConnectingPoint num="9" id="1382" />
-<TGConnectingPoint num="10" id="1383" />
-<TGConnectingPoint num="11" id="1384" />
-<TGConnectingPoint num="12" id="1385" />
-<TGConnectingPoint num="13" id="1386" />
-<TGConnectingPoint num="14" id="1387" />
-<TGConnectingPoint num="15" id="1388" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
+<TGConnectingPoint num="2" id="1367" />
+<TGConnectingPoint num="3" id="1368" />
+<TGConnectingPoint num="4" id="1369" />
+<TGConnectingPoint num="5" id="1370" />
+<TGConnectingPoint num="6" id="1371" />
+<TGConnectingPoint num="7" id="1372" />
+<TGConnectingPoint num="8" id="1373" />
+<TGConnectingPoint num="9" id="1374" />
+<TGConnectingPoint num="10" id="1375" />
+<TGConnectingPoint num="11" id="1376" />
+<TGConnectingPoint num="12" id="1377" />
+<TGConnectingPoint num="13" id="1378" />
+<TGConnectingPoint num="14" id="1379" />
+<TGConnectingPoint num="15" id="1380" />
 <extraparam>
 <Line value="Activity1.docx" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1400" >
+<COMPONENT type="5104" id="1392" >
 <cdparam x="268" y="141" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1390" />
-<TGConnectingPoint num="1" id="1391" />
-<TGConnectingPoint num="2" id="1392" />
-<TGConnectingPoint num="3" id="1393" />
-<TGConnectingPoint num="4" id="1394" />
-<TGConnectingPoint num="5" id="1395" />
-<TGConnectingPoint num="6" id="1396" />
-<TGConnectingPoint num="7" id="1397" />
-<TGConnectingPoint num="8" id="1398" />
-<TGConnectingPoint num="9" id="1399" />
+<TGConnectingPoint num="0" id="1382" />
+<TGConnectingPoint num="1" id="1383" />
+<TGConnectingPoint num="2" id="1384" />
+<TGConnectingPoint num="3" id="1385" />
+<TGConnectingPoint num="4" id="1386" />
+<TGConnectingPoint num="5" id="1387" />
+<TGConnectingPoint num="6" id="1388" />
+<TGConnectingPoint num="7" id="1389" />
+<TGConnectingPoint num="8" id="1390" />
+<TGConnectingPoint num="9" id="1391" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1411" >
+<COMPONENT type="5103" id="1403" >
 <cdparam x="634" y="321" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1401" />
-<TGConnectingPoint num="1" id="1402" />
-<TGConnectingPoint num="2" id="1403" />
-<TGConnectingPoint num="3" id="1404" />
-<TGConnectingPoint num="4" id="1405" />
-<TGConnectingPoint num="5" id="1406" />
-<TGConnectingPoint num="6" id="1407" />
-<TGConnectingPoint num="7" id="1408" />
-<TGConnectingPoint num="8" id="1409" />
-<TGConnectingPoint num="9" id="1410" />
+<TGConnectingPoint num="0" id="1393" />
+<TGConnectingPoint num="1" id="1394" />
+<TGConnectingPoint num="2" id="1395" />
+<TGConnectingPoint num="3" id="1396" />
+<TGConnectingPoint num="4" id="1397" />
+<TGConnectingPoint num="5" id="1398" />
+<TGConnectingPoint num="6" id="1399" />
+<TGConnectingPoint num="7" id="1400" />
+<TGConnectingPoint num="8" id="1401" />
+<TGConnectingPoint num="9" id="1402" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1422" >
+<COMPONENT type="5104" id="1414" >
 <cdparam x="239" y="280" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="1412" />
-<TGConnectingPoint num="1" id="1413" />
-<TGConnectingPoint num="2" id="1414" />
-<TGConnectingPoint num="3" id="1415" />
-<TGConnectingPoint num="4" id="1416" />
-<TGConnectingPoint num="5" id="1417" />
-<TGConnectingPoint num="6" id="1418" />
-<TGConnectingPoint num="7" id="1419" />
-<TGConnectingPoint num="8" id="1420" />
-<TGConnectingPoint num="9" id="1421" />
+<TGConnectingPoint num="0" id="1404" />
+<TGConnectingPoint num="1" id="1405" />
+<TGConnectingPoint num="2" id="1406" />
+<TGConnectingPoint num="3" id="1407" />
+<TGConnectingPoint num="4" id="1408" />
+<TGConnectingPoint num="5" id="1409" />
+<TGConnectingPoint num="6" id="1410" />
+<TGConnectingPoint num="7" id="1411" />
+<TGConnectingPoint num="8" id="1412" />
+<TGConnectingPoint num="9" id="1413" />
 <accessibility />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1495" >
+<COMPONENT type="5106" id="1487" >
 <cdparam x="649" y="239" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="ejectState" />
-<TGConnectingPoint num="0" id="1423" />
-<TGConnectingPoint num="1" id="1424" />
-<TGConnectingPoint num="2" id="1425" />
-<TGConnectingPoint num="3" id="1426" />
-<TGConnectingPoint num="4" id="1427" />
-<TGConnectingPoint num="5" id="1428" />
-<TGConnectingPoint num="6" id="1429" />
-<TGConnectingPoint num="7" id="1430" />
-<TGConnectingPoint num="8" id="1431" />
-<TGConnectingPoint num="9" id="1432" />
-<TGConnectingPoint num="10" id="1433" />
-<TGConnectingPoint num="11" id="1434" />
-<TGConnectingPoint num="12" id="1435" />
-<TGConnectingPoint num="13" id="1436" />
-<TGConnectingPoint num="14" id="1437" />
-<TGConnectingPoint num="15" id="1438" />
-<TGConnectingPoint num="16" id="1439" />
-<TGConnectingPoint num="17" id="1440" />
-<TGConnectingPoint num="18" id="1441" />
-<TGConnectingPoint num="19" id="1442" />
-<TGConnectingPoint num="20" id="1443" />
-<TGConnectingPoint num="21" id="1444" />
-<TGConnectingPoint num="22" id="1445" />
-<TGConnectingPoint num="23" id="1446" />
-<TGConnectingPoint num="24" id="1447" />
-<TGConnectingPoint num="25" id="1448" />
-<TGConnectingPoint num="26" id="1449" />
-<TGConnectingPoint num="27" id="1450" />
-<TGConnectingPoint num="28" id="1451" />
-<TGConnectingPoint num="29" id="1452" />
-<TGConnectingPoint num="30" id="1453" />
-<TGConnectingPoint num="31" id="1454" />
-<TGConnectingPoint num="32" id="1455" />
-<TGConnectingPoint num="33" id="1456" />
-<TGConnectingPoint num="34" id="1457" />
-<TGConnectingPoint num="35" id="1458" />
-<TGConnectingPoint num="36" id="1459" />
-<TGConnectingPoint num="37" id="1460" />
-<TGConnectingPoint num="38" id="1461" />
-<TGConnectingPoint num="39" id="1462" />
-<TGConnectingPoint num="40" id="1463" />
-<TGConnectingPoint num="41" id="1464" />
-<TGConnectingPoint num="42" id="1465" />
-<TGConnectingPoint num="43" id="1466" />
-<TGConnectingPoint num="44" id="1467" />
-<TGConnectingPoint num="45" id="1468" />
-<TGConnectingPoint num="46" id="1469" />
-<TGConnectingPoint num="47" id="1470" />
-<TGConnectingPoint num="48" id="1471" />
-<TGConnectingPoint num="49" id="1472" />
-<TGConnectingPoint num="50" id="1473" />
-<TGConnectingPoint num="51" id="1474" />
-<TGConnectingPoint num="52" id="1475" />
-<TGConnectingPoint num="53" id="1476" />
-<TGConnectingPoint num="54" id="1477" />
-<TGConnectingPoint num="55" id="1478" />
-<TGConnectingPoint num="56" id="1479" />
-<TGConnectingPoint num="57" id="1480" />
-<TGConnectingPoint num="58" id="1481" />
-<TGConnectingPoint num="59" id="1482" />
-<TGConnectingPoint num="60" id="1483" />
-<TGConnectingPoint num="61" id="1484" />
-<TGConnectingPoint num="62" id="1485" />
-<TGConnectingPoint num="63" id="1486" />
-<TGConnectingPoint num="64" id="1487" />
-<TGConnectingPoint num="65" id="1488" />
-<TGConnectingPoint num="66" id="1489" />
-<TGConnectingPoint num="67" id="1490" />
-<TGConnectingPoint num="68" id="1491" />
-<TGConnectingPoint num="69" id="1492" />
-<TGConnectingPoint num="70" id="1493" />
-<TGConnectingPoint num="71" id="1494" />
+<TGConnectingPoint num="0" id="1415" />
+<TGConnectingPoint num="1" id="1416" />
+<TGConnectingPoint num="2" id="1417" />
+<TGConnectingPoint num="3" id="1418" />
+<TGConnectingPoint num="4" id="1419" />
+<TGConnectingPoint num="5" id="1420" />
+<TGConnectingPoint num="6" id="1421" />
+<TGConnectingPoint num="7" id="1422" />
+<TGConnectingPoint num="8" id="1423" />
+<TGConnectingPoint num="9" id="1424" />
+<TGConnectingPoint num="10" id="1425" />
+<TGConnectingPoint num="11" id="1426" />
+<TGConnectingPoint num="12" id="1427" />
+<TGConnectingPoint num="13" id="1428" />
+<TGConnectingPoint num="14" id="1429" />
+<TGConnectingPoint num="15" id="1430" />
+<TGConnectingPoint num="16" id="1431" />
+<TGConnectingPoint num="17" id="1432" />
+<TGConnectingPoint num="18" id="1433" />
+<TGConnectingPoint num="19" id="1434" />
+<TGConnectingPoint num="20" id="1435" />
+<TGConnectingPoint num="21" id="1436" />
+<TGConnectingPoint num="22" id="1437" />
+<TGConnectingPoint num="23" id="1438" />
+<TGConnectingPoint num="24" id="1439" />
+<TGConnectingPoint num="25" id="1440" />
+<TGConnectingPoint num="26" id="1441" />
+<TGConnectingPoint num="27" id="1442" />
+<TGConnectingPoint num="28" id="1443" />
+<TGConnectingPoint num="29" id="1444" />
+<TGConnectingPoint num="30" id="1445" />
+<TGConnectingPoint num="31" id="1446" />
+<TGConnectingPoint num="32" id="1447" />
+<TGConnectingPoint num="33" id="1448" />
+<TGConnectingPoint num="34" id="1449" />
+<TGConnectingPoint num="35" id="1450" />
+<TGConnectingPoint num="36" id="1451" />
+<TGConnectingPoint num="37" id="1452" />
+<TGConnectingPoint num="38" id="1453" />
+<TGConnectingPoint num="39" id="1454" />
+<TGConnectingPoint num="40" id="1455" />
+<TGConnectingPoint num="41" id="1456" />
+<TGConnectingPoint num="42" id="1457" />
+<TGConnectingPoint num="43" id="1458" />
+<TGConnectingPoint num="44" id="1459" />
+<TGConnectingPoint num="45" id="1460" />
+<TGConnectingPoint num="46" id="1461" />
+<TGConnectingPoint num="47" id="1462" />
+<TGConnectingPoint num="48" id="1463" />
+<TGConnectingPoint num="49" id="1464" />
+<TGConnectingPoint num="50" id="1465" />
+<TGConnectingPoint num="51" id="1466" />
+<TGConnectingPoint num="52" id="1467" />
+<TGConnectingPoint num="53" id="1468" />
+<TGConnectingPoint num="54" id="1469" />
+<TGConnectingPoint num="55" id="1470" />
+<TGConnectingPoint num="56" id="1471" />
+<TGConnectingPoint num="57" id="1472" />
+<TGConnectingPoint num="58" id="1473" />
+<TGConnectingPoint num="59" id="1474" />
+<TGConnectingPoint num="60" id="1475" />
+<TGConnectingPoint num="61" id="1476" />
+<TGConnectingPoint num="62" id="1477" />
+<TGConnectingPoint num="63" id="1478" />
+<TGConnectingPoint num="64" id="1479" />
+<TGConnectingPoint num="65" id="1480" />
+<TGConnectingPoint num="66" id="1481" />
+<TGConnectingPoint num="67" id="1482" />
+<TGConnectingPoint num="68" id="1483" />
+<TGConnectingPoint num="69" id="1484" />
+<TGConnectingPoint num="70" id="1485" />
+<TGConnectingPoint num="71" id="1486" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1568" >
+<COMPONENT type="5106" id="1560" >
 <cdparam x="231" y="188" />
 <sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForSecondCoin" />
-<TGConnectingPoint num="0" id="1496" />
-<TGConnectingPoint num="1" id="1497" />
-<TGConnectingPoint num="2" id="1498" />
-<TGConnectingPoint num="3" id="1499" />
-<TGConnectingPoint num="4" id="1500" />
-<TGConnectingPoint num="5" id="1501" />
-<TGConnectingPoint num="6" id="1502" />
-<TGConnectingPoint num="7" id="1503" />
-<TGConnectingPoint num="8" id="1504" />
-<TGConnectingPoint num="9" id="1505" />
-<TGConnectingPoint num="10" id="1506" />
-<TGConnectingPoint num="11" id="1507" />
-<TGConnectingPoint num="12" id="1508" />
-<TGConnectingPoint num="13" id="1509" />
-<TGConnectingPoint num="14" id="1510" />
-<TGConnectingPoint num="15" id="1511" />
-<TGConnectingPoint num="16" id="1512" />
-<TGConnectingPoint num="17" id="1513" />
-<TGConnectingPoint num="18" id="1514" />
-<TGConnectingPoint num="19" id="1515" />
-<TGConnectingPoint num="20" id="1516" />
-<TGConnectingPoint num="21" id="1517" />
-<TGConnectingPoint num="22" id="1518" />
-<TGConnectingPoint num="23" id="1519" />
-<TGConnectingPoint num="24" id="1520" />
-<TGConnectingPoint num="25" id="1521" />
-<TGConnectingPoint num="26" id="1522" />
-<TGConnectingPoint num="27" id="1523" />
-<TGConnectingPoint num="28" id="1524" />
-<TGConnectingPoint num="29" id="1525" />
-<TGConnectingPoint num="30" id="1526" />
-<TGConnectingPoint num="31" id="1527" />
-<TGConnectingPoint num="32" id="1528" />
-<TGConnectingPoint num="33" id="1529" />
-<TGConnectingPoint num="34" id="1530" />
-<TGConnectingPoint num="35" id="1531" />
-<TGConnectingPoint num="36" id="1532" />
-<TGConnectingPoint num="37" id="1533" />
-<TGConnectingPoint num="38" id="1534" />
-<TGConnectingPoint num="39" id="1535" />
-<TGConnectingPoint num="40" id="1536" />
-<TGConnectingPoint num="41" id="1537" />
-<TGConnectingPoint num="42" id="1538" />
-<TGConnectingPoint num="43" id="1539" />
-<TGConnectingPoint num="44" id="1540" />
-<TGConnectingPoint num="45" id="1541" />
-<TGConnectingPoint num="46" id="1542" />
-<TGConnectingPoint num="47" id="1543" />
-<TGConnectingPoint num="48" id="1544" />
-<TGConnectingPoint num="49" id="1545" />
-<TGConnectingPoint num="50" id="1546" />
-<TGConnectingPoint num="51" id="1547" />
-<TGConnectingPoint num="52" id="1548" />
-<TGConnectingPoint num="53" id="1549" />
-<TGConnectingPoint num="54" id="1550" />
-<TGConnectingPoint num="55" id="1551" />
-<TGConnectingPoint num="56" id="1552" />
-<TGConnectingPoint num="57" id="1553" />
-<TGConnectingPoint num="58" id="1554" />
-<TGConnectingPoint num="59" id="1555" />
-<TGConnectingPoint num="60" id="1556" />
-<TGConnectingPoint num="61" id="1557" />
-<TGConnectingPoint num="62" id="1558" />
-<TGConnectingPoint num="63" id="1559" />
-<TGConnectingPoint num="64" id="1560" />
-<TGConnectingPoint num="65" id="1561" />
-<TGConnectingPoint num="66" id="1562" />
-<TGConnectingPoint num="67" id="1563" />
-<TGConnectingPoint num="68" id="1564" />
-<TGConnectingPoint num="69" id="1565" />
-<TGConnectingPoint num="70" id="1566" />
-<TGConnectingPoint num="71" id="1567" />
+<TGConnectingPoint num="0" id="1488" />
+<TGConnectingPoint num="1" id="1489" />
+<TGConnectingPoint num="2" id="1490" />
+<TGConnectingPoint num="3" id="1491" />
+<TGConnectingPoint num="4" id="1492" />
+<TGConnectingPoint num="5" id="1493" />
+<TGConnectingPoint num="6" id="1494" />
+<TGConnectingPoint num="7" id="1495" />
+<TGConnectingPoint num="8" id="1496" />
+<TGConnectingPoint num="9" id="1497" />
+<TGConnectingPoint num="10" id="1498" />
+<TGConnectingPoint num="11" id="1499" />
+<TGConnectingPoint num="12" id="1500" />
+<TGConnectingPoint num="13" id="1501" />
+<TGConnectingPoint num="14" id="1502" />
+<TGConnectingPoint num="15" id="1503" />
+<TGConnectingPoint num="16" id="1504" />
+<TGConnectingPoint num="17" id="1505" />
+<TGConnectingPoint num="18" id="1506" />
+<TGConnectingPoint num="19" id="1507" />
+<TGConnectingPoint num="20" id="1508" />
+<TGConnectingPoint num="21" id="1509" />
+<TGConnectingPoint num="22" id="1510" />
+<TGConnectingPoint num="23" id="1511" />
+<TGConnectingPoint num="24" id="1512" />
+<TGConnectingPoint num="25" id="1513" />
+<TGConnectingPoint num="26" id="1514" />
+<TGConnectingPoint num="27" id="1515" />
+<TGConnectingPoint num="28" id="1516" />
+<TGConnectingPoint num="29" id="1517" />
+<TGConnectingPoint num="30" id="1518" />
+<TGConnectingPoint num="31" id="1519" />
+<TGConnectingPoint num="32" id="1520" />
+<TGConnectingPoint num="33" id="1521" />
+<TGConnectingPoint num="34" id="1522" />
+<TGConnectingPoint num="35" id="1523" />
+<TGConnectingPoint num="36" id="1524" />
+<TGConnectingPoint num="37" id="1525" />
+<TGConnectingPoint num="38" id="1526" />
+<TGConnectingPoint num="39" id="1527" />
+<TGConnectingPoint num="40" id="1528" />
+<TGConnectingPoint num="41" id="1529" />
+<TGConnectingPoint num="42" id="1530" />
+<TGConnectingPoint num="43" id="1531" />
+<TGConnectingPoint num="44" id="1532" />
+<TGConnectingPoint num="45" id="1533" />
+<TGConnectingPoint num="46" id="1534" />
+<TGConnectingPoint num="47" id="1535" />
+<TGConnectingPoint num="48" id="1536" />
+<TGConnectingPoint num="49" id="1537" />
+<TGConnectingPoint num="50" id="1538" />
+<TGConnectingPoint num="51" id="1539" />
+<TGConnectingPoint num="52" id="1540" />
+<TGConnectingPoint num="53" id="1541" />
+<TGConnectingPoint num="54" id="1542" />
+<TGConnectingPoint num="55" id="1543" />
+<TGConnectingPoint num="56" id="1544" />
+<TGConnectingPoint num="57" id="1545" />
+<TGConnectingPoint num="58" id="1546" />
+<TGConnectingPoint num="59" id="1547" />
+<TGConnectingPoint num="60" id="1548" />
+<TGConnectingPoint num="61" id="1549" />
+<TGConnectingPoint num="62" id="1550" />
+<TGConnectingPoint num="63" id="1551" />
+<TGConnectingPoint num="64" id="1552" />
+<TGConnectingPoint num="65" id="1553" />
+<TGConnectingPoint num="66" id="1554" />
+<TGConnectingPoint num="67" id="1555" />
+<TGConnectingPoint num="68" id="1556" />
+<TGConnectingPoint num="69" id="1557" />
+<TGConnectingPoint num="70" id="1558" />
+<TGConnectingPoint num="71" id="1559" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1570" >
+<COMPONENT type="5100" id="1562" >
 <cdparam x="296" y="20" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1569" />
+<TGConnectingPoint num="0" id="1561" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1643" >
+<COMPONENT type="5106" id="1635" >
 <cdparam x="192" y="62" />
 <sizeparam width="220" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1571" />
-<TGConnectingPoint num="1" id="1572" />
-<TGConnectingPoint num="2" id="1573" />
-<TGConnectingPoint num="3" id="1574" />
-<TGConnectingPoint num="4" id="1575" />
-<TGConnectingPoint num="5" id="1576" />
-<TGConnectingPoint num="6" id="1577" />
-<TGConnectingPoint num="7" id="1578" />
-<TGConnectingPoint num="8" id="1579" />
-<TGConnectingPoint num="9" id="1580" />
-<TGConnectingPoint num="10" id="1581" />
-<TGConnectingPoint num="11" id="1582" />
-<TGConnectingPoint num="12" id="1583" />
-<TGConnectingPoint num="13" id="1584" />
-<TGConnectingPoint num="14" id="1585" />
-<TGConnectingPoint num="15" id="1586" />
-<TGConnectingPoint num="16" id="1587" />
-<TGConnectingPoint num="17" id="1588" />
-<TGConnectingPoint num="18" id="1589" />
-<TGConnectingPoint num="19" id="1590" />
-<TGConnectingPoint num="20" id="1591" />
-<TGConnectingPoint num="21" id="1592" />
-<TGConnectingPoint num="22" id="1593" />
-<TGConnectingPoint num="23" id="1594" />
-<TGConnectingPoint num="24" id="1595" />
-<TGConnectingPoint num="25" id="1596" />
-<TGConnectingPoint num="26" id="1597" />
-<TGConnectingPoint num="27" id="1598" />
-<TGConnectingPoint num="28" id="1599" />
-<TGConnectingPoint num="29" id="1600" />
-<TGConnectingPoint num="30" id="1601" />
-<TGConnectingPoint num="31" id="1602" />
-<TGConnectingPoint num="32" id="1603" />
-<TGConnectingPoint num="33" id="1604" />
-<TGConnectingPoint num="34" id="1605" />
-<TGConnectingPoint num="35" id="1606" />
-<TGConnectingPoint num="36" id="1607" />
-<TGConnectingPoint num="37" id="1608" />
-<TGConnectingPoint num="38" id="1609" />
-<TGConnectingPoint num="39" id="1610" />
-<TGConnectingPoint num="40" id="1611" />
-<TGConnectingPoint num="41" id="1612" />
-<TGConnectingPoint num="42" id="1613" />
-<TGConnectingPoint num="43" id="1614" />
-<TGConnectingPoint num="44" id="1615" />
-<TGConnectingPoint num="45" id="1616" />
-<TGConnectingPoint num="46" id="1617" />
-<TGConnectingPoint num="47" id="1618" />
-<TGConnectingPoint num="48" id="1619" />
-<TGConnectingPoint num="49" id="1620" />
-<TGConnectingPoint num="50" id="1621" />
-<TGConnectingPoint num="51" id="1622" />
-<TGConnectingPoint num="52" id="1623" />
-<TGConnectingPoint num="53" id="1624" />
-<TGConnectingPoint num="54" id="1625" />
-<TGConnectingPoint num="55" id="1626" />
-<TGConnectingPoint num="56" id="1627" />
-<TGConnectingPoint num="57" id="1628" />
-<TGConnectingPoint num="58" id="1629" />
-<TGConnectingPoint num="59" id="1630" />
-<TGConnectingPoint num="60" id="1631" />
-<TGConnectingPoint num="61" id="1632" />
-<TGConnectingPoint num="62" id="1633" />
-<TGConnectingPoint num="63" id="1634" />
-<TGConnectingPoint num="64" id="1635" />
-<TGConnectingPoint num="65" id="1636" />
-<TGConnectingPoint num="66" id="1637" />
-<TGConnectingPoint num="67" id="1638" />
-<TGConnectingPoint num="68" id="1639" />
-<TGConnectingPoint num="69" id="1640" />
-<TGConnectingPoint num="70" id="1641" />
-<TGConnectingPoint num="71" id="1642" />
+<TGConnectingPoint num="0" id="1563" />
+<TGConnectingPoint num="1" id="1564" />
+<TGConnectingPoint num="2" id="1565" />
+<TGConnectingPoint num="3" id="1566" />
+<TGConnectingPoint num="4" id="1567" />
+<TGConnectingPoint num="5" id="1568" />
+<TGConnectingPoint num="6" id="1569" />
+<TGConnectingPoint num="7" id="1570" />
+<TGConnectingPoint num="8" id="1571" />
+<TGConnectingPoint num="9" id="1572" />
+<TGConnectingPoint num="10" id="1573" />
+<TGConnectingPoint num="11" id="1574" />
+<TGConnectingPoint num="12" id="1575" />
+<TGConnectingPoint num="13" id="1576" />
+<TGConnectingPoint num="14" id="1577" />
+<TGConnectingPoint num="15" id="1578" />
+<TGConnectingPoint num="16" id="1579" />
+<TGConnectingPoint num="17" id="1580" />
+<TGConnectingPoint num="18" id="1581" />
+<TGConnectingPoint num="19" id="1582" />
+<TGConnectingPoint num="20" id="1583" />
+<TGConnectingPoint num="21" id="1584" />
+<TGConnectingPoint num="22" id="1585" />
+<TGConnectingPoint num="23" id="1586" />
+<TGConnectingPoint num="24" id="1587" />
+<TGConnectingPoint num="25" id="1588" />
+<TGConnectingPoint num="26" id="1589" />
+<TGConnectingPoint num="27" id="1590" />
+<TGConnectingPoint num="28" id="1591" />
+<TGConnectingPoint num="29" id="1592" />
+<TGConnectingPoint num="30" id="1593" />
+<TGConnectingPoint num="31" id="1594" />
+<TGConnectingPoint num="32" id="1595" />
+<TGConnectingPoint num="33" id="1596" />
+<TGConnectingPoint num="34" id="1597" />
+<TGConnectingPoint num="35" id="1598" />
+<TGConnectingPoint num="36" id="1599" />
+<TGConnectingPoint num="37" id="1600" />
+<TGConnectingPoint num="38" id="1601" />
+<TGConnectingPoint num="39" id="1602" />
+<TGConnectingPoint num="40" id="1603" />
+<TGConnectingPoint num="41" id="1604" />
+<TGConnectingPoint num="42" id="1605" />
+<TGConnectingPoint num="43" id="1606" />
+<TGConnectingPoint num="44" id="1607" />
+<TGConnectingPoint num="45" id="1608" />
+<TGConnectingPoint num="46" id="1609" />
+<TGConnectingPoint num="47" id="1610" />
+<TGConnectingPoint num="48" id="1611" />
+<TGConnectingPoint num="49" id="1612" />
+<TGConnectingPoint num="50" id="1613" />
+<TGConnectingPoint num="51" id="1614" />
+<TGConnectingPoint num="52" id="1615" />
+<TGConnectingPoint num="53" id="1616" />
+<TGConnectingPoint num="54" id="1617" />
+<TGConnectingPoint num="55" id="1618" />
+<TGConnectingPoint num="56" id="1619" />
+<TGConnectingPoint num="57" id="1620" />
+<TGConnectingPoint num="58" id="1621" />
+<TGConnectingPoint num="59" id="1622" />
+<TGConnectingPoint num="60" id="1623" />
+<TGConnectingPoint num="61" id="1624" />
+<TGConnectingPoint num="62" id="1625" />
+<TGConnectingPoint num="63" id="1626" />
+<TGConnectingPoint num="64" id="1627" />
+<TGConnectingPoint num="65" id="1628" />
+<TGConnectingPoint num="66" id="1629" />
+<TGConnectingPoint num="67" id="1630" />
+<TGConnectingPoint num="68" id="1631" />
+<TGConnectingPoint num="69" id="1632" />
+<TGConnectingPoint num="70" id="1633" />
+<TGConnectingPoint num="71" id="1634" />
 <latencyCheck />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1716" >
+<COMPONENT type="5106" id="1708" >
 <cdparam x="221" y="748" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1644" />
-<TGConnectingPoint num="1" id="1645" />
-<TGConnectingPoint num="2" id="1646" />
-<TGConnectingPoint num="3" id="1647" />
-<TGConnectingPoint num="4" id="1648" />
-<TGConnectingPoint num="5" id="1649" />
-<TGConnectingPoint num="6" id="1650" />
-<TGConnectingPoint num="7" id="1651" />
-<TGConnectingPoint num="8" id="1652" />
-<TGConnectingPoint num="9" id="1653" />
-<TGConnectingPoint num="10" id="1654" />
-<TGConnectingPoint num="11" id="1655" />
-<TGConnectingPoint num="12" id="1656" />
-<TGConnectingPoint num="13" id="1657" />
-<TGConnectingPoint num="14" id="1658" />
-<TGConnectingPoint num="15" id="1659" />
-<TGConnectingPoint num="16" id="1660" />
-<TGConnectingPoint num="17" id="1661" />
-<TGConnectingPoint num="18" id="1662" />
-<TGConnectingPoint num="19" id="1663" />
-<TGConnectingPoint num="20" id="1664" />
-<TGConnectingPoint num="21" id="1665" />
-<TGConnectingPoint num="22" id="1666" />
-<TGConnectingPoint num="23" id="1667" />
-<TGConnectingPoint num="24" id="1668" />
-<TGConnectingPoint num="25" id="1669" />
-<TGConnectingPoint num="26" id="1670" />
-<TGConnectingPoint num="27" id="1671" />
-<TGConnectingPoint num="28" id="1672" />
-<TGConnectingPoint num="29" id="1673" />
-<TGConnectingPoint num="30" id="1674" />
-<TGConnectingPoint num="31" id="1675" />
-<TGConnectingPoint num="32" id="1676" />
-<TGConnectingPoint num="33" id="1677" />
-<TGConnectingPoint num="34" id="1678" />
-<TGConnectingPoint num="35" id="1679" />
-<TGConnectingPoint num="36" id="1680" />
-<TGConnectingPoint num="37" id="1681" />
-<TGConnectingPoint num="38" id="1682" />
-<TGConnectingPoint num="39" id="1683" />
-<TGConnectingPoint num="40" id="1684" />
-<TGConnectingPoint num="41" id="1685" />
-<TGConnectingPoint num="42" id="1686" />
-<TGConnectingPoint num="43" id="1687" />
-<TGConnectingPoint num="44" id="1688" />
-<TGConnectingPoint num="45" id="1689" />
-<TGConnectingPoint num="46" id="1690" />
-<TGConnectingPoint num="47" id="1691" />
-<TGConnectingPoint num="48" id="1692" />
-<TGConnectingPoint num="49" id="1693" />
-<TGConnectingPoint num="50" id="1694" />
-<TGConnectingPoint num="51" id="1695" />
-<TGConnectingPoint num="52" id="1696" />
-<TGConnectingPoint num="53" id="1697" />
-<TGConnectingPoint num="54" id="1698" />
-<TGConnectingPoint num="55" id="1699" />
-<TGConnectingPoint num="56" id="1700" />
-<TGConnectingPoint num="57" id="1701" />
-<TGConnectingPoint num="58" id="1702" />
-<TGConnectingPoint num="59" id="1703" />
-<TGConnectingPoint num="60" id="1704" />
-<TGConnectingPoint num="61" id="1705" />
-<TGConnectingPoint num="62" id="1706" />
-<TGConnectingPoint num="63" id="1707" />
-<TGConnectingPoint num="64" id="1708" />
-<TGConnectingPoint num="65" id="1709" />
-<TGConnectingPoint num="66" id="1710" />
-<TGConnectingPoint num="67" id="1711" />
-<TGConnectingPoint num="68" id="1712" />
-<TGConnectingPoint num="69" id="1713" />
-<TGConnectingPoint num="70" id="1714" />
-<TGConnectingPoint num="71" id="1715" />
+<TGConnectingPoint num="0" id="1636" />
+<TGConnectingPoint num="1" id="1637" />
+<TGConnectingPoint num="2" id="1638" />
+<TGConnectingPoint num="3" id="1639" />
+<TGConnectingPoint num="4" id="1640" />
+<TGConnectingPoint num="5" id="1641" />
+<TGConnectingPoint num="6" id="1642" />
+<TGConnectingPoint num="7" id="1643" />
+<TGConnectingPoint num="8" id="1644" />
+<TGConnectingPoint num="9" id="1645" />
+<TGConnectingPoint num="10" id="1646" />
+<TGConnectingPoint num="11" id="1647" />
+<TGConnectingPoint num="12" id="1648" />
+<TGConnectingPoint num="13" id="1649" />
+<TGConnectingPoint num="14" id="1650" />
+<TGConnectingPoint num="15" id="1651" />
+<TGConnectingPoint num="16" id="1652" />
+<TGConnectingPoint num="17" id="1653" />
+<TGConnectingPoint num="18" id="1654" />
+<TGConnectingPoint num="19" id="1655" />
+<TGConnectingPoint num="20" id="1656" />
+<TGConnectingPoint num="21" id="1657" />
+<TGConnectingPoint num="22" id="1658" />
+<TGConnectingPoint num="23" id="1659" />
+<TGConnectingPoint num="24" id="1660" />
+<TGConnectingPoint num="25" id="1661" />
+<TGConnectingPoint num="26" id="1662" />
+<TGConnectingPoint num="27" id="1663" />
+<TGConnectingPoint num="28" id="1664" />
+<TGConnectingPoint num="29" id="1665" />
+<TGConnectingPoint num="30" id="1666" />
+<TGConnectingPoint num="31" id="1667" />
+<TGConnectingPoint num="32" id="1668" />
+<TGConnectingPoint num="33" id="1669" />
+<TGConnectingPoint num="34" id="1670" />
+<TGConnectingPoint num="35" id="1671" />
+<TGConnectingPoint num="36" id="1672" />
+<TGConnectingPoint num="37" id="1673" />
+<TGConnectingPoint num="38" id="1674" />
+<TGConnectingPoint num="39" id="1675" />
+<TGConnectingPoint num="40" id="1676" />
+<TGConnectingPoint num="41" id="1677" />
+<TGConnectingPoint num="42" id="1678" />
+<TGConnectingPoint num="43" id="1679" />
+<TGConnectingPoint num="44" id="1680" />
+<TGConnectingPoint num="45" id="1681" />
+<TGConnectingPoint num="46" id="1682" />
+<TGConnectingPoint num="47" id="1683" />
+<TGConnectingPoint num="48" id="1684" />
+<TGConnectingPoint num="49" id="1685" />
+<TGConnectingPoint num="50" id="1686" />
+<TGConnectingPoint num="51" id="1687" />
+<TGConnectingPoint num="52" id="1688" />
+<TGConnectingPoint num="53" id="1689" />
+<TGConnectingPoint num="54" id="1690" />
+<TGConnectingPoint num="55" id="1691" />
+<TGConnectingPoint num="56" id="1692" />
+<TGConnectingPoint num="57" id="1693" />
+<TGConnectingPoint num="58" id="1694" />
+<TGConnectingPoint num="59" id="1695" />
+<TGConnectingPoint num="60" id="1696" />
+<TGConnectingPoint num="61" id="1697" />
+<TGConnectingPoint num="62" id="1698" />
+<TGConnectingPoint num="63" id="1699" />
+<TGConnectingPoint num="64" id="1700" />
+<TGConnectingPoint num="65" id="1701" />
+<TGConnectingPoint num="66" id="1702" />
+<TGConnectingPoint num="67" id="1703" />
+<TGConnectingPoint num="68" id="1704" />
+<TGConnectingPoint num="69" id="1705" />
+<TGConnectingPoint num="70" id="1706" />
+<TGConnectingPoint num="71" id="1707" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1789" >
+<COMPONENT type="5106" id="1781" >
 <cdparam x="631" y="381" />
 <sizeparam width="137" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="WaitingForFirstCoin" />
-<TGConnectingPoint num="0" id="1717" />
-<TGConnectingPoint num="1" id="1718" />
-<TGConnectingPoint num="2" id="1719" />
-<TGConnectingPoint num="3" id="1720" />
-<TGConnectingPoint num="4" id="1721" />
-<TGConnectingPoint num="5" id="1722" />
-<TGConnectingPoint num="6" id="1723" />
-<TGConnectingPoint num="7" id="1724" />
-<TGConnectingPoint num="8" id="1725" />
-<TGConnectingPoint num="9" id="1726" />
-<TGConnectingPoint num="10" id="1727" />
-<TGConnectingPoint num="11" id="1728" />
-<TGConnectingPoint num="12" id="1729" />
-<TGConnectingPoint num="13" id="1730" />
-<TGConnectingPoint num="14" id="1731" />
-<TGConnectingPoint num="15" id="1732" />
-<TGConnectingPoint num="16" id="1733" />
-<TGConnectingPoint num="17" id="1734" />
-<TGConnectingPoint num="18" id="1735" />
-<TGConnectingPoint num="19" id="1736" />
-<TGConnectingPoint num="20" id="1737" />
-<TGConnectingPoint num="21" id="1738" />
-<TGConnectingPoint num="22" id="1739" />
-<TGConnectingPoint num="23" id="1740" />
-<TGConnectingPoint num="24" id="1741" />
-<TGConnectingPoint num="25" id="1742" />
-<TGConnectingPoint num="26" id="1743" />
-<TGConnectingPoint num="27" id="1744" />
-<TGConnectingPoint num="28" id="1745" />
-<TGConnectingPoint num="29" id="1746" />
-<TGConnectingPoint num="30" id="1747" />
-<TGConnectingPoint num="31" id="1748" />
-<TGConnectingPoint num="32" id="1749" />
-<TGConnectingPoint num="33" id="1750" />
-<TGConnectingPoint num="34" id="1751" />
-<TGConnectingPoint num="35" id="1752" />
-<TGConnectingPoint num="36" id="1753" />
-<TGConnectingPoint num="37" id="1754" />
-<TGConnectingPoint num="38" id="1755" />
-<TGConnectingPoint num="39" id="1756" />
-<TGConnectingPoint num="40" id="1757" />
-<TGConnectingPoint num="41" id="1758" />
-<TGConnectingPoint num="42" id="1759" />
-<TGConnectingPoint num="43" id="1760" />
-<TGConnectingPoint num="44" id="1761" />
-<TGConnectingPoint num="45" id="1762" />
-<TGConnectingPoint num="46" id="1763" />
-<TGConnectingPoint num="47" id="1764" />
-<TGConnectingPoint num="48" id="1765" />
-<TGConnectingPoint num="49" id="1766" />
-<TGConnectingPoint num="50" id="1767" />
-<TGConnectingPoint num="51" id="1768" />
-<TGConnectingPoint num="52" id="1769" />
-<TGConnectingPoint num="53" id="1770" />
-<TGConnectingPoint num="54" id="1771" />
-<TGConnectingPoint num="55" id="1772" />
-<TGConnectingPoint num="56" id="1773" />
-<TGConnectingPoint num="57" id="1774" />
-<TGConnectingPoint num="58" id="1775" />
-<TGConnectingPoint num="59" id="1776" />
-<TGConnectingPoint num="60" id="1777" />
-<TGConnectingPoint num="61" id="1778" />
-<TGConnectingPoint num="62" id="1779" />
-<TGConnectingPoint num="63" id="1780" />
-<TGConnectingPoint num="64" id="1781" />
-<TGConnectingPoint num="65" id="1782" />
-<TGConnectingPoint num="66" id="1783" />
-<TGConnectingPoint num="67" id="1784" />
-<TGConnectingPoint num="68" id="1785" />
-<TGConnectingPoint num="69" id="1786" />
-<TGConnectingPoint num="70" id="1787" />
-<TGConnectingPoint num="71" id="1788" />
+<TGConnectingPoint num="0" id="1709" />
+<TGConnectingPoint num="1" id="1710" />
+<TGConnectingPoint num="2" id="1711" />
+<TGConnectingPoint num="3" id="1712" />
+<TGConnectingPoint num="4" id="1713" />
+<TGConnectingPoint num="5" id="1714" />
+<TGConnectingPoint num="6" id="1715" />
+<TGConnectingPoint num="7" id="1716" />
+<TGConnectingPoint num="8" id="1717" />
+<TGConnectingPoint num="9" id="1718" />
+<TGConnectingPoint num="10" id="1719" />
+<TGConnectingPoint num="11" id="1720" />
+<TGConnectingPoint num="12" id="1721" />
+<TGConnectingPoint num="13" id="1722" />
+<TGConnectingPoint num="14" id="1723" />
+<TGConnectingPoint num="15" id="1724" />
+<TGConnectingPoint num="16" id="1725" />
+<TGConnectingPoint num="17" id="1726" />
+<TGConnectingPoint num="18" id="1727" />
+<TGConnectingPoint num="19" id="1728" />
+<TGConnectingPoint num="20" id="1729" />
+<TGConnectingPoint num="21" id="1730" />
+<TGConnectingPoint num="22" id="1731" />
+<TGConnectingPoint num="23" id="1732" />
+<TGConnectingPoint num="24" id="1733" />
+<TGConnectingPoint num="25" id="1734" />
+<TGConnectingPoint num="26" id="1735" />
+<TGConnectingPoint num="27" id="1736" />
+<TGConnectingPoint num="28" id="1737" />
+<TGConnectingPoint num="29" id="1738" />
+<TGConnectingPoint num="30" id="1739" />
+<TGConnectingPoint num="31" id="1740" />
+<TGConnectingPoint num="32" id="1741" />
+<TGConnectingPoint num="33" id="1742" />
+<TGConnectingPoint num="34" id="1743" />
+<TGConnectingPoint num="35" id="1744" />
+<TGConnectingPoint num="36" id="1745" />
+<TGConnectingPoint num="37" id="1746" />
+<TGConnectingPoint num="38" id="1747" />
+<TGConnectingPoint num="39" id="1748" />
+<TGConnectingPoint num="40" id="1749" />
+<TGConnectingPoint num="41" id="1750" />
+<TGConnectingPoint num="42" id="1751" />
+<TGConnectingPoint num="43" id="1752" />
+<TGConnectingPoint num="44" id="1753" />
+<TGConnectingPoint num="45" id="1754" />
+<TGConnectingPoint num="46" id="1755" />
+<TGConnectingPoint num="47" id="1756" />
+<TGConnectingPoint num="48" id="1757" />
+<TGConnectingPoint num="49" id="1758" />
+<TGConnectingPoint num="50" id="1759" />
+<TGConnectingPoint num="51" id="1760" />
+<TGConnectingPoint num="52" id="1761" />
+<TGConnectingPoint num="53" id="1762" />
+<TGConnectingPoint num="54" id="1763" />
+<TGConnectingPoint num="55" id="1764" />
+<TGConnectingPoint num="56" id="1765" />
+<TGConnectingPoint num="57" id="1766" />
+<TGConnectingPoint num="58" id="1767" />
+<TGConnectingPoint num="59" id="1768" />
+<TGConnectingPoint num="60" id="1769" />
+<TGConnectingPoint num="61" id="1770" />
+<TGConnectingPoint num="62" id="1771" />
+<TGConnectingPoint num="63" id="1772" />
+<TGConnectingPoint num="64" id="1773" />
+<TGConnectingPoint num="65" id="1774" />
+<TGConnectingPoint num="66" id="1775" />
+<TGConnectingPoint num="67" id="1776" />
+<TGConnectingPoint num="68" id="1777" />
+<TGConnectingPoint num="69" id="1778" />
+<TGConnectingPoint num="70" id="1779" />
+<TGConnectingPoint num="71" id="1780" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1970" >
+<COMPONENT type="5106" id="1962" >
 <cdparam x="23" y="372" />
 <sizeparam width="577" height="354" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="state0" value="Beverage" />
-<TGConnectingPoint num="0" id="1898" />
-<TGConnectingPoint num="1" id="1899" />
-<TGConnectingPoint num="2" id="1900" />
-<TGConnectingPoint num="3" id="1901" />
-<TGConnectingPoint num="4" id="1902" />
-<TGConnectingPoint num="5" id="1903" />
-<TGConnectingPoint num="6" id="1904" />
-<TGConnectingPoint num="7" id="1905" />
-<TGConnectingPoint num="8" id="1906" />
-<TGConnectingPoint num="9" id="1907" />
-<TGConnectingPoint num="10" id="1908" />
-<TGConnectingPoint num="11" id="1909" />
-<TGConnectingPoint num="12" id="1910" />
-<TGConnectingPoint num="13" id="1911" />
-<TGConnectingPoint num="14" id="1912" />
-<TGConnectingPoint num="15" id="1913" />
-<TGConnectingPoint num="16" id="1914" />
-<TGConnectingPoint num="17" id="1915" />
-<TGConnectingPoint num="18" id="1916" />
-<TGConnectingPoint num="19" id="1917" />
-<TGConnectingPoint num="20" id="1918" />
-<TGConnectingPoint num="21" id="1919" />
-<TGConnectingPoint num="22" id="1920" />
-<TGConnectingPoint num="23" id="1921" />
-<TGConnectingPoint num="24" id="1922" />
-<TGConnectingPoint num="25" id="1923" />
-<TGConnectingPoint num="26" id="1924" />
-<TGConnectingPoint num="27" id="1925" />
-<TGConnectingPoint num="28" id="1926" />
-<TGConnectingPoint num="29" id="1927" />
-<TGConnectingPoint num="30" id="1928" />
-<TGConnectingPoint num="31" id="1929" />
-<TGConnectingPoint num="32" id="1930" />
-<TGConnectingPoint num="33" id="1931" />
-<TGConnectingPoint num="34" id="1932" />
-<TGConnectingPoint num="35" id="1933" />
-<TGConnectingPoint num="36" id="1934" />
-<TGConnectingPoint num="37" id="1935" />
-<TGConnectingPoint num="38" id="1936" />
-<TGConnectingPoint num="39" id="1937" />
-<TGConnectingPoint num="40" id="1938" />
-<TGConnectingPoint num="41" id="1939" />
-<TGConnectingPoint num="42" id="1940" />
-<TGConnectingPoint num="43" id="1941" />
-<TGConnectingPoint num="44" id="1942" />
-<TGConnectingPoint num="45" id="1943" />
-<TGConnectingPoint num="46" id="1944" />
-<TGConnectingPoint num="47" id="1945" />
-<TGConnectingPoint num="48" id="1946" />
-<TGConnectingPoint num="49" id="1947" />
-<TGConnectingPoint num="50" id="1948" />
-<TGConnectingPoint num="51" id="1949" />
-<TGConnectingPoint num="52" id="1950" />
-<TGConnectingPoint num="53" id="1951" />
-<TGConnectingPoint num="54" id="1952" />
-<TGConnectingPoint num="55" id="1953" />
-<TGConnectingPoint num="56" id="1954" />
-<TGConnectingPoint num="57" id="1955" />
-<TGConnectingPoint num="58" id="1956" />
-<TGConnectingPoint num="59" id="1957" />
-<TGConnectingPoint num="60" id="1958" />
-<TGConnectingPoint num="61" id="1959" />
-<TGConnectingPoint num="62" id="1960" />
-<TGConnectingPoint num="63" id="1961" />
-<TGConnectingPoint num="64" id="1962" />
-<TGConnectingPoint num="65" id="1963" />
-<TGConnectingPoint num="66" id="1964" />
-<TGConnectingPoint num="67" id="1965" />
-<TGConnectingPoint num="68" id="1966" />
-<TGConnectingPoint num="69" id="1967" />
-<TGConnectingPoint num="70" id="1968" />
-<TGConnectingPoint num="71" id="1969" />
+<TGConnectingPoint num="0" id="1890" />
+<TGConnectingPoint num="1" id="1891" />
+<TGConnectingPoint num="2" id="1892" />
+<TGConnectingPoint num="3" id="1893" />
+<TGConnectingPoint num="4" id="1894" />
+<TGConnectingPoint num="5" id="1895" />
+<TGConnectingPoint num="6" id="1896" />
+<TGConnectingPoint num="7" id="1897" />
+<TGConnectingPoint num="8" id="1898" />
+<TGConnectingPoint num="9" id="1899" />
+<TGConnectingPoint num="10" id="1900" />
+<TGConnectingPoint num="11" id="1901" />
+<TGConnectingPoint num="12" id="1902" />
+<TGConnectingPoint num="13" id="1903" />
+<TGConnectingPoint num="14" id="1904" />
+<TGConnectingPoint num="15" id="1905" />
+<TGConnectingPoint num="16" id="1906" />
+<TGConnectingPoint num="17" id="1907" />
+<TGConnectingPoint num="18" id="1908" />
+<TGConnectingPoint num="19" id="1909" />
+<TGConnectingPoint num="20" id="1910" />
+<TGConnectingPoint num="21" id="1911" />
+<TGConnectingPoint num="22" id="1912" />
+<TGConnectingPoint num="23" id="1913" />
+<TGConnectingPoint num="24" id="1914" />
+<TGConnectingPoint num="25" id="1915" />
+<TGConnectingPoint num="26" id="1916" />
+<TGConnectingPoint num="27" id="1917" />
+<TGConnectingPoint num="28" id="1918" />
+<TGConnectingPoint num="29" id="1919" />
+<TGConnectingPoint num="30" id="1920" />
+<TGConnectingPoint num="31" id="1921" />
+<TGConnectingPoint num="32" id="1922" />
+<TGConnectingPoint num="33" id="1923" />
+<TGConnectingPoint num="34" id="1924" />
+<TGConnectingPoint num="35" id="1925" />
+<TGConnectingPoint num="36" id="1926" />
+<TGConnectingPoint num="37" id="1927" />
+<TGConnectingPoint num="38" id="1928" />
+<TGConnectingPoint num="39" id="1929" />
+<TGConnectingPoint num="40" id="1930" />
+<TGConnectingPoint num="41" id="1931" />
+<TGConnectingPoint num="42" id="1932" />
+<TGConnectingPoint num="43" id="1933" />
+<TGConnectingPoint num="44" id="1934" />
+<TGConnectingPoint num="45" id="1935" />
+<TGConnectingPoint num="46" id="1936" />
+<TGConnectingPoint num="47" id="1937" />
+<TGConnectingPoint num="48" id="1938" />
+<TGConnectingPoint num="49" id="1939" />
+<TGConnectingPoint num="50" id="1940" />
+<TGConnectingPoint num="51" id="1941" />
+<TGConnectingPoint num="52" id="1942" />
+<TGConnectingPoint num="53" id="1943" />
+<TGConnectingPoint num="54" id="1944" />
+<TGConnectingPoint num="55" id="1945" />
+<TGConnectingPoint num="56" id="1946" />
+<TGConnectingPoint num="57" id="1947" />
+<TGConnectingPoint num="58" id="1948" />
+<TGConnectingPoint num="59" id="1949" />
+<TGConnectingPoint num="60" id="1950" />
+<TGConnectingPoint num="61" id="1951" />
+<TGConnectingPoint num="62" id="1952" />
+<TGConnectingPoint num="63" id="1953" />
+<TGConnectingPoint num="64" id="1954" />
+<TGConnectingPoint num="65" id="1955" />
+<TGConnectingPoint num="66" id="1956" />
+<TGConnectingPoint num="67" id="1957" />
+<TGConnectingPoint num="68" id="1958" />
+<TGConnectingPoint num="69" id="1959" />
+<TGConnectingPoint num="70" id="1960" />
+<TGConnectingPoint num="71" id="1961" />
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5104" id="1800" >
-<father id="1970" num="0" />
+<SUBCOMPONENT type="5104" id="1792" >
+<father id="1962" num="0" />
 <cdparam x="242" y="529" />
 <sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="1790" />
-<TGConnectingPoint num="1" id="1791" />
-<TGConnectingPoint num="2" id="1792" />
-<TGConnectingPoint num="3" id="1793" />
-<TGConnectingPoint num="4" id="1794" />
-<TGConnectingPoint num="5" id="1795" />
-<TGConnectingPoint num="6" id="1796" />
-<TGConnectingPoint num="7" id="1797" />
-<TGConnectingPoint num="8" id="1798" />
-<TGConnectingPoint num="9" id="1799" />
+<TGConnectingPoint num="0" id="1782" />
+<TGConnectingPoint num="1" id="1783" />
+<TGConnectingPoint num="2" id="1784" />
+<TGConnectingPoint num="3" id="1785" />
+<TGConnectingPoint num="4" id="1786" />
+<TGConnectingPoint num="5" id="1787" />
+<TGConnectingPoint num="6" id="1788" />
+<TGConnectingPoint num="7" id="1789" />
+<TGConnectingPoint num="8" id="1790" />
+<TGConnectingPoint num="9" id="1791" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="1873" >
-<father id="1970" num="1" />
+<SUBCOMPONENT type="5106" id="1865" >
+<father id="1962" num="1" />
 <cdparam x="194" y="437" />
 <sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
 <infoparam name="state0" value="WaitingForSelection" />
-<TGConnectingPoint num="0" id="1801" />
-<TGConnectingPoint num="1" id="1802" />
-<TGConnectingPoint num="2" id="1803" />
-<TGConnectingPoint num="3" id="1804" />
-<TGConnectingPoint num="4" id="1805" />
-<TGConnectingPoint num="5" id="1806" />
-<TGConnectingPoint num="6" id="1807" />
-<TGConnectingPoint num="7" id="1808" />
-<TGConnectingPoint num="8" id="1809" />
-<TGConnectingPoint num="9" id="1810" />
-<TGConnectingPoint num="10" id="1811" />
-<TGConnectingPoint num="11" id="1812" />
-<TGConnectingPoint num="12" id="1813" />
-<TGConnectingPoint num="13" id="1814" />
-<TGConnectingPoint num="14" id="1815" />
-<TGConnectingPoint num="15" id="1816" />
-<TGConnectingPoint num="16" id="1817" />
-<TGConnectingPoint num="17" id="1818" />
-<TGConnectingPoint num="18" id="1819" />
-<TGConnectingPoint num="19" id="1820" />
-<TGConnectingPoint num="20" id="1821" />
-<TGConnectingPoint num="21" id="1822" />
-<TGConnectingPoint num="22" id="1823" />
-<TGConnectingPoint num="23" id="1824" />
-<TGConnectingPoint num="24" id="1825" />
-<TGConnectingPoint num="25" id="1826" />
-<TGConnectingPoint num="26" id="1827" />
-<TGConnectingPoint num="27" id="1828" />
-<TGConnectingPoint num="28" id="1829" />
-<TGConnectingPoint num="29" id="1830" />
-<TGConnectingPoint num="30" id="1831" />
-<TGConnectingPoint num="31" id="1832" />
-<TGConnectingPoint num="32" id="1833" />
-<TGConnectingPoint num="33" id="1834" />
-<TGConnectingPoint num="34" id="1835" />
-<TGConnectingPoint num="35" id="1836" />
-<TGConnectingPoint num="36" id="1837" />
-<TGConnectingPoint num="37" id="1838" />
-<TGConnectingPoint num="38" id="1839" />
-<TGConnectingPoint num="39" id="1840" />
-<TGConnectingPoint num="40" id="1841" />
-<TGConnectingPoint num="41" id="1842" />
-<TGConnectingPoint num="42" id="1843" />
-<TGConnectingPoint num="43" id="1844" />
-<TGConnectingPoint num="44" id="1845" />
-<TGConnectingPoint num="45" id="1846" />
-<TGConnectingPoint num="46" id="1847" />
-<TGConnectingPoint num="47" id="1848" />
-<TGConnectingPoint num="48" id="1849" />
-<TGConnectingPoint num="49" id="1850" />
-<TGConnectingPoint num="50" id="1851" />
-<TGConnectingPoint num="51" id="1852" />
-<TGConnectingPoint num="52" id="1853" />
-<TGConnectingPoint num="53" id="1854" />
-<TGConnectingPoint num="54" id="1855" />
-<TGConnectingPoint num="55" id="1856" />
-<TGConnectingPoint num="56" id="1857" />
-<TGConnectingPoint num="57" id="1858" />
-<TGConnectingPoint num="58" id="1859" />
-<TGConnectingPoint num="59" id="1860" />
-<TGConnectingPoint num="60" id="1861" />
-<TGConnectingPoint num="61" id="1862" />
-<TGConnectingPoint num="62" id="1863" />
-<TGConnectingPoint num="63" id="1864" />
-<TGConnectingPoint num="64" id="1865" />
-<TGConnectingPoint num="65" id="1866" />
-<TGConnectingPoint num="66" id="1867" />
-<TGConnectingPoint num="67" id="1868" />
-<TGConnectingPoint num="68" id="1869" />
-<TGConnectingPoint num="69" id="1870" />
-<TGConnectingPoint num="70" id="1871" />
-<TGConnectingPoint num="71" id="1872" />
+<TGConnectingPoint num="0" id="1793" />
+<TGConnectingPoint num="1" id="1794" />
+<TGConnectingPoint num="2" id="1795" />
+<TGConnectingPoint num="3" id="1796" />
+<TGConnectingPoint num="4" id="1797" />
+<TGConnectingPoint num="5" id="1798" />
+<TGConnectingPoint num="6" id="1799" />
+<TGConnectingPoint num="7" id="1800" />
+<TGConnectingPoint num="8" id="1801" />
+<TGConnectingPoint num="9" id="1802" />
+<TGConnectingPoint num="10" id="1803" />
+<TGConnectingPoint num="11" id="1804" />
+<TGConnectingPoint num="12" id="1805" />
+<TGConnectingPoint num="13" id="1806" />
+<TGConnectingPoint num="14" id="1807" />
+<TGConnectingPoint num="15" id="1808" />
+<TGConnectingPoint num="16" id="1809" />
+<TGConnectingPoint num="17" id="1810" />
+<TGConnectingPoint num="18" id="1811" />
+<TGConnectingPoint num="19" id="1812" />
+<TGConnectingPoint num="20" id="1813" />
+<TGConnectingPoint num="21" id="1814" />
+<TGConnectingPoint num="22" id="1815" />
+<TGConnectingPoint num="23" id="1816" />
+<TGConnectingPoint num="24" id="1817" />
+<TGConnectingPoint num="25" id="1818" />
+<TGConnectingPoint num="26" id="1819" />
+<TGConnectingPoint num="27" id="1820" />
+<TGConnectingPoint num="28" id="1821" />
+<TGConnectingPoint num="29" id="1822" />
+<TGConnectingPoint num="30" id="1823" />
+<TGConnectingPoint num="31" id="1824" />
+<TGConnectingPoint num="32" id="1825" />
+<TGConnectingPoint num="33" id="1826" />
+<TGConnectingPoint num="34" id="1827" />
+<TGConnectingPoint num="35" id="1828" />
+<TGConnectingPoint num="36" id="1829" />
+<TGConnectingPoint num="37" id="1830" />
+<TGConnectingPoint num="38" id="1831" />
+<TGConnectingPoint num="39" id="1832" />
+<TGConnectingPoint num="40" id="1833" />
+<TGConnectingPoint num="41" id="1834" />
+<TGConnectingPoint num="42" id="1835" />
+<TGConnectingPoint num="43" id="1836" />
+<TGConnectingPoint num="44" id="1837" />
+<TGConnectingPoint num="45" id="1838" />
+<TGConnectingPoint num="46" id="1839" />
+<TGConnectingPoint num="47" id="1840" />
+<TGConnectingPoint num="48" id="1841" />
+<TGConnectingPoint num="49" id="1842" />
+<TGConnectingPoint num="50" id="1843" />
+<TGConnectingPoint num="51" id="1844" />
+<TGConnectingPoint num="52" id="1845" />
+<TGConnectingPoint num="53" id="1846" />
+<TGConnectingPoint num="54" id="1847" />
+<TGConnectingPoint num="55" id="1848" />
+<TGConnectingPoint num="56" id="1849" />
+<TGConnectingPoint num="57" id="1850" />
+<TGConnectingPoint num="58" id="1851" />
+<TGConnectingPoint num="59" id="1852" />
+<TGConnectingPoint num="60" id="1853" />
+<TGConnectingPoint num="61" id="1854" />
+<TGConnectingPoint num="62" id="1855" />
+<TGConnectingPoint num="63" id="1856" />
+<TGConnectingPoint num="64" id="1857" />
+<TGConnectingPoint num="65" id="1858" />
+<TGConnectingPoint num="66" id="1859" />
+<TGConnectingPoint num="67" id="1860" />
+<TGConnectingPoint num="68" id="1861" />
+<TGConnectingPoint num="69" id="1862" />
+<TGConnectingPoint num="70" id="1863" />
+<TGConnectingPoint num="71" id="1864" />
 <latencyCheck />
 <extraparam>
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="1875" >
-<father id="1970" num="2" />
+<SUBCOMPONENT type="5100" id="1867" >
+<father id="1962" num="2" />
 <cdparam x="254" y="401" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1874" />
+<TGConnectingPoint num="0" id="1866" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="1886" >
-<father id="1970" num="3" />
+<SUBCOMPONENT type="5104" id="1878" >
+<father id="1962" num="3" />
 <cdparam x="63" y="529" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="1876" />
-<TGConnectingPoint num="1" id="1877" />
-<TGConnectingPoint num="2" id="1878" />
-<TGConnectingPoint num="3" id="1879" />
-<TGConnectingPoint num="4" id="1880" />
-<TGConnectingPoint num="5" id="1881" />
-<TGConnectingPoint num="6" id="1882" />
-<TGConnectingPoint num="7" id="1883" />
-<TGConnectingPoint num="8" id="1884" />
-<TGConnectingPoint num="9" id="1885" />
+<TGConnectingPoint num="0" id="1868" />
+<TGConnectingPoint num="1" id="1869" />
+<TGConnectingPoint num="2" id="1870" />
+<TGConnectingPoint num="3" id="1871" />
+<TGConnectingPoint num="4" id="1872" />
+<TGConnectingPoint num="5" id="1873" />
+<TGConnectingPoint num="6" id="1874" />
+<TGConnectingPoint num="7" id="1875" />
+<TGConnectingPoint num="8" id="1876" />
+<TGConnectingPoint num="9" id="1877" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1897" >
-<father id="1970" num="4" />
+<SUBCOMPONENT type="5103" id="1889" >
+<father id="1962" num="4" />
 <cdparam x="377" y="502" />
 <sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
 <infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="1887" />
-<TGConnectingPoint num="1" id="1888" />
-<TGConnectingPoint num="2" id="1889" />
-<TGConnectingPoint num="3" id="1890" />
-<TGConnectingPoint num="4" id="1891" />
-<TGConnectingPoint num="5" id="1892" />
-<TGConnectingPoint num="6" id="1893" />
-<TGConnectingPoint num="7" id="1894" />
-<TGConnectingPoint num="8" id="1895" />
-<TGConnectingPoint num="9" id="1896" />
+<TGConnectingPoint num="0" id="1879" />
+<TGConnectingPoint num="1" id="1880" />
+<TGConnectingPoint num="2" id="1881" />
+<TGConnectingPoint num="3" id="1882" />
+<TGConnectingPoint num="4" id="1883" />
+<TGConnectingPoint num="5" id="1884" />
+<TGConnectingPoint num="6" id="1885" />
+<TGConnectingPoint num="7" id="1886" />
+<TGConnectingPoint num="8" id="1887" />
+<TGConnectingPoint num="9" id="1888" />
 <accessibility />
 </SUBCOMPONENT>
 
@@ -3411,30 +3498,32 @@
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Wallet" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1977" >
+<CONNECTOR type="5102" id="1969" >
 <cdparam x="516" y="264" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1976" />
-<P1  x="485" y="219" id="2018" />
-<P2  x="485" y="275" id="2029" />
+<TGConnectingPoint num="0" id="1968" />
+<P1  x="485" y="219" id="2010" />
+<P2  x="485" y="275" id="2021" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1975" >
-<father id="1977" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1967" >
+<father id="1969" num="0" />
 <cdparam x="493" y="251" />
 <sizeparam width="173" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1971" />
-<TGConnectingPoint num="1" id="1972" />
-<TGConnectingPoint num="2" id="1973" />
-<TGConnectingPoint num="3" id="1974" />
+<TGConnectingPoint num="0" id="1963" />
+<TGConnectingPoint num="1" id="1964" />
+<TGConnectingPoint num="2" id="1965" />
+<TGConnectingPoint num="3" id="1966" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3443,60 +3532,64 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1984" >
+<CONNECTOR type="5102" id="1976" >
 <cdparam x="382" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1983" />
-<P1  x="382" y="165" id="2189" />
-<P2  x="485" y="189" id="2017" />
+<TGConnectingPoint num="0" id="1975" />
+<P1  x="382" y="165" id="2181" />
+<P2  x="485" y="189" id="2009" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1982" >
-<father id="1984" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1974" >
+<father id="1976" num="0" />
 <cdparam x="419" y="170" />
 <sizeparam width="20" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1978" />
-<TGConnectingPoint num="1" id="1979" />
-<TGConnectingPoint num="2" id="1980" />
-<TGConnectingPoint num="3" id="1981" />
+<TGConnectingPoint num="0" id="1970" />
+<TGConnectingPoint num="1" id="1971" />
+<TGConnectingPoint num="2" id="1972" />
+<TGConnectingPoint num="3" id="1973" />
 <extraparam>
 <guard value="[]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1991" >
+<CONNECTOR type="5102" id="1983" >
 <cdparam x="223" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1990" />
-<P1  x="251" y="231" id="2007" />
-<P2  x="252" y="300" id="2102" />
+<TGConnectingPoint num="0" id="1982" />
+<P1  x="251" y="231" id="1999" />
+<P2  x="252" y="300" id="2094" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1989" >
-<father id="1991" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1981" >
+<father id="1983" num="0" />
 <cdparam x="175" y="246" />
 <sizeparam width="225" height="60" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1985" />
-<TGConnectingPoint num="1" id="1986" />
-<TGConnectingPoint num="2" id="1987" />
-<TGConnectingPoint num="3" id="1988" />
+<TGConnectingPoint num="0" id="1977" />
+<TGConnectingPoint num="1" id="1978" />
+<TGConnectingPoint num="2" id="1979" />
+<TGConnectingPoint num="3" id="1980" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="minUserDelay" enabled="true"/>
 <afterMax value="maxUserDelay" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="0.99" enabled="true"/>
@@ -3505,60 +3598,64 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1998" >
+<CONNECTOR type="5102" id="1990" >
 <cdparam x="357" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1997" />
-<P1  x="357" y="165" id="2188" />
-<P2  x="251" y="201" id="2006" />
+<TGConnectingPoint num="0" id="1989" />
+<P1  x="357" y="165" id="2180" />
+<P2  x="251" y="201" id="1998" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1996" >
-<father id="1998" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1988" >
+<father id="1990" num="0" />
 <cdparam x="220" y="174" />
 <sizeparam width="99" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1992" />
-<TGConnectingPoint num="1" id="1993" />
-<TGConnectingPoint num="2" id="1994" />
-<TGConnectingPoint num="3" id="1995" />
+<TGConnectingPoint num="0" id="1984" />
+<TGConnectingPoint num="1" id="1985" />
+<TGConnectingPoint num="2" id="1986" />
+<TGConnectingPoint num="3" id="1987" />
 <extraparam>
 <guard value="[nbOfCoins &gt; 0]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2005" >
+<CONNECTOR type="5102" id="1997" >
 <cdparam x="369" y="115" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2004" />
-<P1  x="370" y="64" id="2247" />
-<P2  x="370" y="135" id="2175" />
+<TGConnectingPoint num="0" id="1996" />
+<P1  x="370" y="64" id="2239" />
+<P2  x="370" y="135" id="2167" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2003" >
-<father id="2005" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1995" >
+<father id="1997" num="0" />
 <cdparam x="376" y="105" />
 <sizeparam width="173" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1999" />
-<TGConnectingPoint num="1" id="2000" />
-<TGConnectingPoint num="2" id="2001" />
-<TGConnectingPoint num="3" id="2002" />
+<TGConnectingPoint num="0" id="1991" />
+<TGConnectingPoint num="1" id="1992" />
+<TGConnectingPoint num="2" id="1993" />
+<TGConnectingPoint num="3" id="1994" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -3566,300 +3663,300 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="2016" >
+<COMPONENT type="5103" id="2008" >
 <cdparam x="217" y="206" />
 <sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="putCoin(x)" />
-<TGConnectingPoint num="0" id="2006" />
-<TGConnectingPoint num="1" id="2007" />
-<TGConnectingPoint num="2" id="2008" />
-<TGConnectingPoint num="3" id="2009" />
-<TGConnectingPoint num="4" id="2010" />
-<TGConnectingPoint num="5" id="2011" />
-<TGConnectingPoint num="6" id="2012" />
-<TGConnectingPoint num="7" id="2013" />
-<TGConnectingPoint num="8" id="2014" />
-<TGConnectingPoint num="9" id="2015" />
+<TGConnectingPoint num="0" id="1998" />
+<TGConnectingPoint num="1" id="1999" />
+<TGConnectingPoint num="2" id="2000" />
+<TGConnectingPoint num="3" id="2001" />
+<TGConnectingPoint num="4" id="2002" />
+<TGConnectingPoint num="5" id="2003" />
+<TGConnectingPoint num="6" id="2004" />
+<TGConnectingPoint num="7" id="2005" />
+<TGConnectingPoint num="8" id="2006" />
+<TGConnectingPoint num="9" id="2007" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="2027" >
+<COMPONENT type="5104" id="2019" >
 <cdparam x="447" y="194" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="getCoin(x)" />
-<TGConnectingPoint num="0" id="2017" />
-<TGConnectingPoint num="1" id="2018" />
-<TGConnectingPoint num="2" id="2019" />
-<TGConnectingPoint num="3" id="2020" />
-<TGConnectingPoint num="4" id="2021" />
-<TGConnectingPoint num="5" id="2022" />
-<TGConnectingPoint num="6" id="2023" />
-<TGConnectingPoint num="7" id="2024" />
-<TGConnectingPoint num="8" id="2025" />
-<TGConnectingPoint num="9" id="2026" />
+<TGConnectingPoint num="0" id="2009" />
+<TGConnectingPoint num="1" id="2010" />
+<TGConnectingPoint num="2" id="2011" />
+<TGConnectingPoint num="3" id="2012" />
+<TGConnectingPoint num="4" id="2013" />
+<TGConnectingPoint num="5" id="2014" />
+<TGConnectingPoint num="6" id="2015" />
+<TGConnectingPoint num="7" id="2016" />
+<TGConnectingPoint num="8" id="2017" />
+<TGConnectingPoint num="9" id="2018" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2100" >
+<COMPONENT type="5106" id="2092" >
 <cdparam x="460" y="275" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2028" />
-<TGConnectingPoint num="1" id="2029" />
-<TGConnectingPoint num="2" id="2030" />
-<TGConnectingPoint num="3" id="2031" />
-<TGConnectingPoint num="4" id="2032" />
-<TGConnectingPoint num="5" id="2033" />
-<TGConnectingPoint num="6" id="2034" />
-<TGConnectingPoint num="7" id="2035" />
-<TGConnectingPoint num="8" id="2036" />
-<TGConnectingPoint num="9" id="2037" />
-<TGConnectingPoint num="10" id="2038" />
-<TGConnectingPoint num="11" id="2039" />
-<TGConnectingPoint num="12" id="2040" />
-<TGConnectingPoint num="13" id="2041" />
-<TGConnectingPoint num="14" id="2042" />
-<TGConnectingPoint num="15" id="2043" />
-<TGConnectingPoint num="16" id="2044" />
-<TGConnectingPoint num="17" id="2045" />
-<TGConnectingPoint num="18" id="2046" />
-<TGConnectingPoint num="19" id="2047" />
-<TGConnectingPoint num="20" id="2048" />
-<TGConnectingPoint num="21" id="2049" />
-<TGConnectingPoint num="22" id="2050" />
-<TGConnectingPoint num="23" id="2051" />
-<TGConnectingPoint num="24" id="2052" />
-<TGConnectingPoint num="25" id="2053" />
-<TGConnectingPoint num="26" id="2054" />
-<TGConnectingPoint num="27" id="2055" />
-<TGConnectingPoint num="28" id="2056" />
-<TGConnectingPoint num="29" id="2057" />
-<TGConnectingPoint num="30" id="2058" />
-<TGConnectingPoint num="31" id="2059" />
-<TGConnectingPoint num="32" id="2060" />
-<TGConnectingPoint num="33" id="2061" />
-<TGConnectingPoint num="34" id="2062" />
-<TGConnectingPoint num="35" id="2063" />
-<TGConnectingPoint num="36" id="2064" />
-<TGConnectingPoint num="37" id="2065" />
-<TGConnectingPoint num="38" id="2066" />
-<TGConnectingPoint num="39" id="2067" />
-<TGConnectingPoint num="40" id="2068" />
-<TGConnectingPoint num="41" id="2069" />
-<TGConnectingPoint num="42" id="2070" />
-<TGConnectingPoint num="43" id="2071" />
-<TGConnectingPoint num="44" id="2072" />
-<TGConnectingPoint num="45" id="2073" />
-<TGConnectingPoint num="46" id="2074" />
-<TGConnectingPoint num="47" id="2075" />
-<TGConnectingPoint num="48" id="2076" />
-<TGConnectingPoint num="49" id="2077" />
-<TGConnectingPoint num="50" id="2078" />
-<TGConnectingPoint num="51" id="2079" />
-<TGConnectingPoint num="52" id="2080" />
-<TGConnectingPoint num="53" id="2081" />
-<TGConnectingPoint num="54" id="2082" />
-<TGConnectingPoint num="55" id="2083" />
-<TGConnectingPoint num="56" id="2084" />
-<TGConnectingPoint num="57" id="2085" />
-<TGConnectingPoint num="58" id="2086" />
-<TGConnectingPoint num="59" id="2087" />
-<TGConnectingPoint num="60" id="2088" />
-<TGConnectingPoint num="61" id="2089" />
-<TGConnectingPoint num="62" id="2090" />
-<TGConnectingPoint num="63" id="2091" />
-<TGConnectingPoint num="64" id="2092" />
-<TGConnectingPoint num="65" id="2093" />
-<TGConnectingPoint num="66" id="2094" />
-<TGConnectingPoint num="67" id="2095" />
-<TGConnectingPoint num="68" id="2096" />
-<TGConnectingPoint num="69" id="2097" />
-<TGConnectingPoint num="70" id="2098" />
-<TGConnectingPoint num="71" id="2099" />
+<TGConnectingPoint num="0" id="2020" />
+<TGConnectingPoint num="1" id="2021" />
+<TGConnectingPoint num="2" id="2022" />
+<TGConnectingPoint num="3" id="2023" />
+<TGConnectingPoint num="4" id="2024" />
+<TGConnectingPoint num="5" id="2025" />
+<TGConnectingPoint num="6" id="2026" />
+<TGConnectingPoint num="7" id="2027" />
+<TGConnectingPoint num="8" id="2028" />
+<TGConnectingPoint num="9" id="2029" />
+<TGConnectingPoint num="10" id="2030" />
+<TGConnectingPoint num="11" id="2031" />
+<TGConnectingPoint num="12" id="2032" />
+<TGConnectingPoint num="13" id="2033" />
+<TGConnectingPoint num="14" id="2034" />
+<TGConnectingPoint num="15" id="2035" />
+<TGConnectingPoint num="16" id="2036" />
+<TGConnectingPoint num="17" id="2037" />
+<TGConnectingPoint num="18" id="2038" />
+<TGConnectingPoint num="19" id="2039" />
+<TGConnectingPoint num="20" id="2040" />
+<TGConnectingPoint num="21" id="2041" />
+<TGConnectingPoint num="22" id="2042" />
+<TGConnectingPoint num="23" id="2043" />
+<TGConnectingPoint num="24" id="2044" />
+<TGConnectingPoint num="25" id="2045" />
+<TGConnectingPoint num="26" id="2046" />
+<TGConnectingPoint num="27" id="2047" />
+<TGConnectingPoint num="28" id="2048" />
+<TGConnectingPoint num="29" id="2049" />
+<TGConnectingPoint num="30" id="2050" />
+<TGConnectingPoint num="31" id="2051" />
+<TGConnectingPoint num="32" id="2052" />
+<TGConnectingPoint num="33" id="2053" />
+<TGConnectingPoint num="34" id="2054" />
+<TGConnectingPoint num="35" id="2055" />
+<TGConnectingPoint num="36" id="2056" />
+<TGConnectingPoint num="37" id="2057" />
+<TGConnectingPoint num="38" id="2058" />
+<TGConnectingPoint num="39" id="2059" />
+<TGConnectingPoint num="40" id="2060" />
+<TGConnectingPoint num="41" id="2061" />
+<TGConnectingPoint num="42" id="2062" />
+<TGConnectingPoint num="43" id="2063" />
+<TGConnectingPoint num="44" id="2064" />
+<TGConnectingPoint num="45" id="2065" />
+<TGConnectingPoint num="46" id="2066" />
+<TGConnectingPoint num="47" id="2067" />
+<TGConnectingPoint num="48" id="2068" />
+<TGConnectingPoint num="49" id="2069" />
+<TGConnectingPoint num="50" id="2070" />
+<TGConnectingPoint num="51" id="2071" />
+<TGConnectingPoint num="52" id="2072" />
+<TGConnectingPoint num="53" id="2073" />
+<TGConnectingPoint num="54" id="2074" />
+<TGConnectingPoint num="55" id="2075" />
+<TGConnectingPoint num="56" id="2076" />
+<TGConnectingPoint num="57" id="2077" />
+<TGConnectingPoint num="58" id="2078" />
+<TGConnectingPoint num="59" id="2079" />
+<TGConnectingPoint num="60" id="2080" />
+<TGConnectingPoint num="61" id="2081" />
+<TGConnectingPoint num="62" id="2082" />
+<TGConnectingPoint num="63" id="2083" />
+<TGConnectingPoint num="64" id="2084" />
+<TGConnectingPoint num="65" id="2085" />
+<TGConnectingPoint num="66" id="2086" />
+<TGConnectingPoint num="67" id="2087" />
+<TGConnectingPoint num="68" id="2088" />
+<TGConnectingPoint num="69" id="2089" />
+<TGConnectingPoint num="70" id="2090" />
+<TGConnectingPoint num="71" id="2091" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2173" >
+<COMPONENT type="5106" id="2165" >
 <cdparam x="227" y="300" />
 <sizeparam width="50" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2101" />
-<TGConnectingPoint num="1" id="2102" />
-<TGConnectingPoint num="2" id="2103" />
-<TGConnectingPoint num="3" id="2104" />
-<TGConnectingPoint num="4" id="2105" />
-<TGConnectingPoint num="5" id="2106" />
-<TGConnectingPoint num="6" id="2107" />
-<TGConnectingPoint num="7" id="2108" />
-<TGConnectingPoint num="8" id="2109" />
-<TGConnectingPoint num="9" id="2110" />
-<TGConnectingPoint num="10" id="2111" />
-<TGConnectingPoint num="11" id="2112" />
-<TGConnectingPoint num="12" id="2113" />
-<TGConnectingPoint num="13" id="2114" />
-<TGConnectingPoint num="14" id="2115" />
-<TGConnectingPoint num="15" id="2116" />
-<TGConnectingPoint num="16" id="2117" />
-<TGConnectingPoint num="17" id="2118" />
-<TGConnectingPoint num="18" id="2119" />
-<TGConnectingPoint num="19" id="2120" />
-<TGConnectingPoint num="20" id="2121" />
-<TGConnectingPoint num="21" id="2122" />
-<TGConnectingPoint num="22" id="2123" />
-<TGConnectingPoint num="23" id="2124" />
-<TGConnectingPoint num="24" id="2125" />
-<TGConnectingPoint num="25" id="2126" />
-<TGConnectingPoint num="26" id="2127" />
-<TGConnectingPoint num="27" id="2128" />
-<TGConnectingPoint num="28" id="2129" />
-<TGConnectingPoint num="29" id="2130" />
-<TGConnectingPoint num="30" id="2131" />
-<TGConnectingPoint num="31" id="2132" />
-<TGConnectingPoint num="32" id="2133" />
-<TGConnectingPoint num="33" id="2134" />
-<TGConnectingPoint num="34" id="2135" />
-<TGConnectingPoint num="35" id="2136" />
-<TGConnectingPoint num="36" id="2137" />
-<TGConnectingPoint num="37" id="2138" />
-<TGConnectingPoint num="38" id="2139" />
-<TGConnectingPoint num="39" id="2140" />
-<TGConnectingPoint num="40" id="2141" />
-<TGConnectingPoint num="41" id="2142" />
-<TGConnectingPoint num="42" id="2143" />
-<TGConnectingPoint num="43" id="2144" />
-<TGConnectingPoint num="44" id="2145" />
-<TGConnectingPoint num="45" id="2146" />
-<TGConnectingPoint num="46" id="2147" />
-<TGConnectingPoint num="47" id="2148" />
-<TGConnectingPoint num="48" id="2149" />
-<TGConnectingPoint num="49" id="2150" />
-<TGConnectingPoint num="50" id="2151" />
-<TGConnectingPoint num="51" id="2152" />
-<TGConnectingPoint num="52" id="2153" />
-<TGConnectingPoint num="53" id="2154" />
-<TGConnectingPoint num="54" id="2155" />
-<TGConnectingPoint num="55" id="2156" />
-<TGConnectingPoint num="56" id="2157" />
-<TGConnectingPoint num="57" id="2158" />
-<TGConnectingPoint num="58" id="2159" />
-<TGConnectingPoint num="59" id="2160" />
-<TGConnectingPoint num="60" id="2161" />
-<TGConnectingPoint num="61" id="2162" />
-<TGConnectingPoint num="62" id="2163" />
-<TGConnectingPoint num="63" id="2164" />
-<TGConnectingPoint num="64" id="2165" />
-<TGConnectingPoint num="65" id="2166" />
-<TGConnectingPoint num="66" id="2167" />
-<TGConnectingPoint num="67" id="2168" />
-<TGConnectingPoint num="68" id="2169" />
-<TGConnectingPoint num="69" id="2170" />
-<TGConnectingPoint num="70" id="2171" />
-<TGConnectingPoint num="71" id="2172" />
+<TGConnectingPoint num="0" id="2093" />
+<TGConnectingPoint num="1" id="2094" />
+<TGConnectingPoint num="2" id="2095" />
+<TGConnectingPoint num="3" id="2096" />
+<TGConnectingPoint num="4" id="2097" />
+<TGConnectingPoint num="5" id="2098" />
+<TGConnectingPoint num="6" id="2099" />
+<TGConnectingPoint num="7" id="2100" />
+<TGConnectingPoint num="8" id="2101" />
+<TGConnectingPoint num="9" id="2102" />
+<TGConnectingPoint num="10" id="2103" />
+<TGConnectingPoint num="11" id="2104" />
+<TGConnectingPoint num="12" id="2105" />
+<TGConnectingPoint num="13" id="2106" />
+<TGConnectingPoint num="14" id="2107" />
+<TGConnectingPoint num="15" id="2108" />
+<TGConnectingPoint num="16" id="2109" />
+<TGConnectingPoint num="17" id="2110" />
+<TGConnectingPoint num="18" id="2111" />
+<TGConnectingPoint num="19" id="2112" />
+<TGConnectingPoint num="20" id="2113" />
+<TGConnectingPoint num="21" id="2114" />
+<TGConnectingPoint num="22" id="2115" />
+<TGConnectingPoint num="23" id="2116" />
+<TGConnectingPoint num="24" id="2117" />
+<TGConnectingPoint num="25" id="2118" />
+<TGConnectingPoint num="26" id="2119" />
+<TGConnectingPoint num="27" id="2120" />
+<TGConnectingPoint num="28" id="2121" />
+<TGConnectingPoint num="29" id="2122" />
+<TGConnectingPoint num="30" id="2123" />
+<TGConnectingPoint num="31" id="2124" />
+<TGConnectingPoint num="32" id="2125" />
+<TGConnectingPoint num="33" id="2126" />
+<TGConnectingPoint num="34" id="2127" />
+<TGConnectingPoint num="35" id="2128" />
+<TGConnectingPoint num="36" id="2129" />
+<TGConnectingPoint num="37" id="2130" />
+<TGConnectingPoint num="38" id="2131" />
+<TGConnectingPoint num="39" id="2132" />
+<TGConnectingPoint num="40" id="2133" />
+<TGConnectingPoint num="41" id="2134" />
+<TGConnectingPoint num="42" id="2135" />
+<TGConnectingPoint num="43" id="2136" />
+<TGConnectingPoint num="44" id="2137" />
+<TGConnectingPoint num="45" id="2138" />
+<TGConnectingPoint num="46" id="2139" />
+<TGConnectingPoint num="47" id="2140" />
+<TGConnectingPoint num="48" id="2141" />
+<TGConnectingPoint num="49" id="2142" />
+<TGConnectingPoint num="50" id="2143" />
+<TGConnectingPoint num="51" id="2144" />
+<TGConnectingPoint num="52" id="2145" />
+<TGConnectingPoint num="53" id="2146" />
+<TGConnectingPoint num="54" id="2147" />
+<TGConnectingPoint num="55" id="2148" />
+<TGConnectingPoint num="56" id="2149" />
+<TGConnectingPoint num="57" id="2150" />
+<TGConnectingPoint num="58" id="2151" />
+<TGConnectingPoint num="59" id="2152" />
+<TGConnectingPoint num="60" id="2153" />
+<TGConnectingPoint num="61" id="2154" />
+<TGConnectingPoint num="62" id="2155" />
+<TGConnectingPoint num="63" id="2156" />
+<TGConnectingPoint num="64" id="2157" />
+<TGConnectingPoint num="65" id="2158" />
+<TGConnectingPoint num="66" id="2159" />
+<TGConnectingPoint num="67" id="2160" />
+<TGConnectingPoint num="68" id="2161" />
+<TGConnectingPoint num="69" id="2162" />
+<TGConnectingPoint num="70" id="2163" />
+<TGConnectingPoint num="71" id="2164" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2246" >
+<COMPONENT type="5106" id="2238" >
 <cdparam x="345" y="135" />
 <sizeparam width="50" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="main" />
-<TGConnectingPoint num="0" id="2174" />
-<TGConnectingPoint num="1" id="2175" />
-<TGConnectingPoint num="2" id="2176" />
-<TGConnectingPoint num="3" id="2177" />
-<TGConnectingPoint num="4" id="2178" />
-<TGConnectingPoint num="5" id="2179" />
-<TGConnectingPoint num="6" id="2180" />
-<TGConnectingPoint num="7" id="2181" />
-<TGConnectingPoint num="8" id="2182" />
-<TGConnectingPoint num="9" id="2183" />
-<TGConnectingPoint num="10" id="2184" />
-<TGConnectingPoint num="11" id="2185" />
-<TGConnectingPoint num="12" id="2186" />
-<TGConnectingPoint num="13" id="2187" />
-<TGConnectingPoint num="14" id="2188" />
-<TGConnectingPoint num="15" id="2189" />
-<TGConnectingPoint num="16" id="2190" />
-<TGConnectingPoint num="17" id="2191" />
-<TGConnectingPoint num="18" id="2192" />
-<TGConnectingPoint num="19" id="2193" />
-<TGConnectingPoint num="20" id="2194" />
-<TGConnectingPoint num="21" id="2195" />
-<TGConnectingPoint num="22" id="2196" />
-<TGConnectingPoint num="23" id="2197" />
-<TGConnectingPoint num="24" id="2198" />
-<TGConnectingPoint num="25" id="2199" />
-<TGConnectingPoint num="26" id="2200" />
-<TGConnectingPoint num="27" id="2201" />
-<TGConnectingPoint num="28" id="2202" />
-<TGConnectingPoint num="29" id="2203" />
-<TGConnectingPoint num="30" id="2204" />
-<TGConnectingPoint num="31" id="2205" />
-<TGConnectingPoint num="32" id="2206" />
-<TGConnectingPoint num="33" id="2207" />
-<TGConnectingPoint num="34" id="2208" />
-<TGConnectingPoint num="35" id="2209" />
-<TGConnectingPoint num="36" id="2210" />
-<TGConnectingPoint num="37" id="2211" />
-<TGConnectingPoint num="38" id="2212" />
-<TGConnectingPoint num="39" id="2213" />
-<TGConnectingPoint num="40" id="2214" />
-<TGConnectingPoint num="41" id="2215" />
-<TGConnectingPoint num="42" id="2216" />
-<TGConnectingPoint num="43" id="2217" />
-<TGConnectingPoint num="44" id="2218" />
-<TGConnectingPoint num="45" id="2219" />
-<TGConnectingPoint num="46" id="2220" />
-<TGConnectingPoint num="47" id="2221" />
-<TGConnectingPoint num="48" id="2222" />
-<TGConnectingPoint num="49" id="2223" />
-<TGConnectingPoint num="50" id="2224" />
-<TGConnectingPoint num="51" id="2225" />
-<TGConnectingPoint num="52" id="2226" />
-<TGConnectingPoint num="53" id="2227" />
-<TGConnectingPoint num="54" id="2228" />
-<TGConnectingPoint num="55" id="2229" />
-<TGConnectingPoint num="56" id="2230" />
-<TGConnectingPoint num="57" id="2231" />
-<TGConnectingPoint num="58" id="2232" />
-<TGConnectingPoint num="59" id="2233" />
-<TGConnectingPoint num="60" id="2234" />
-<TGConnectingPoint num="61" id="2235" />
-<TGConnectingPoint num="62" id="2236" />
-<TGConnectingPoint num="63" id="2237" />
-<TGConnectingPoint num="64" id="2238" />
-<TGConnectingPoint num="65" id="2239" />
-<TGConnectingPoint num="66" id="2240" />
-<TGConnectingPoint num="67" id="2241" />
-<TGConnectingPoint num="68" id="2242" />
-<TGConnectingPoint num="69" id="2243" />
-<TGConnectingPoint num="70" id="2244" />
-<TGConnectingPoint num="71" id="2245" />
+<TGConnectingPoint num="0" id="2166" />
+<TGConnectingPoint num="1" id="2167" />
+<TGConnectingPoint num="2" id="2168" />
+<TGConnectingPoint num="3" id="2169" />
+<TGConnectingPoint num="4" id="2170" />
+<TGConnectingPoint num="5" id="2171" />
+<TGConnectingPoint num="6" id="2172" />
+<TGConnectingPoint num="7" id="2173" />
+<TGConnectingPoint num="8" id="2174" />
+<TGConnectingPoint num="9" id="2175" />
+<TGConnectingPoint num="10" id="2176" />
+<TGConnectingPoint num="11" id="2177" />
+<TGConnectingPoint num="12" id="2178" />
+<TGConnectingPoint num="13" id="2179" />
+<TGConnectingPoint num="14" id="2180" />
+<TGConnectingPoint num="15" id="2181" />
+<TGConnectingPoint num="16" id="2182" />
+<TGConnectingPoint num="17" id="2183" />
+<TGConnectingPoint num="18" id="2184" />
+<TGConnectingPoint num="19" id="2185" />
+<TGConnectingPoint num="20" id="2186" />
+<TGConnectingPoint num="21" id="2187" />
+<TGConnectingPoint num="22" id="2188" />
+<TGConnectingPoint num="23" id="2189" />
+<TGConnectingPoint num="24" id="2190" />
+<TGConnectingPoint num="25" id="2191" />
+<TGConnectingPoint num="26" id="2192" />
+<TGConnectingPoint num="27" id="2193" />
+<TGConnectingPoint num="28" id="2194" />
+<TGConnectingPoint num="29" id="2195" />
+<TGConnectingPoint num="30" id="2196" />
+<TGConnectingPoint num="31" id="2197" />
+<TGConnectingPoint num="32" id="2198" />
+<TGConnectingPoint num="33" id="2199" />
+<TGConnectingPoint num="34" id="2200" />
+<TGConnectingPoint num="35" id="2201" />
+<TGConnectingPoint num="36" id="2202" />
+<TGConnectingPoint num="37" id="2203" />
+<TGConnectingPoint num="38" id="2204" />
+<TGConnectingPoint num="39" id="2205" />
+<TGConnectingPoint num="40" id="2206" />
+<TGConnectingPoint num="41" id="2207" />
+<TGConnectingPoint num="42" id="2208" />
+<TGConnectingPoint num="43" id="2209" />
+<TGConnectingPoint num="44" id="2210" />
+<TGConnectingPoint num="45" id="2211" />
+<TGConnectingPoint num="46" id="2212" />
+<TGConnectingPoint num="47" id="2213" />
+<TGConnectingPoint num="48" id="2214" />
+<TGConnectingPoint num="49" id="2215" />
+<TGConnectingPoint num="50" id="2216" />
+<TGConnectingPoint num="51" id="2217" />
+<TGConnectingPoint num="52" id="2218" />
+<TGConnectingPoint num="53" id="2219" />
+<TGConnectingPoint num="54" id="2220" />
+<TGConnectingPoint num="55" id="2221" />
+<TGConnectingPoint num="56" id="2222" />
+<TGConnectingPoint num="57" id="2223" />
+<TGConnectingPoint num="58" id="2224" />
+<TGConnectingPoint num="59" id="2225" />
+<TGConnectingPoint num="60" id="2226" />
+<TGConnectingPoint num="61" id="2227" />
+<TGConnectingPoint num="62" id="2228" />
+<TGConnectingPoint num="63" id="2229" />
+<TGConnectingPoint num="64" id="2230" />
+<TGConnectingPoint num="65" id="2231" />
+<TGConnectingPoint num="66" id="2232" />
+<TGConnectingPoint num="67" id="2233" />
+<TGConnectingPoint num="68" id="2234" />
+<TGConnectingPoint num="69" id="2235" />
+<TGConnectingPoint num="70" id="2236" />
+<TGConnectingPoint num="71" id="2237" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="2248" >
+<COMPONENT type="5100" id="2240" >
 <cdparam x="363" y="44" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2247" />
+<TGConnectingPoint num="0" id="2239" />
 </COMPONENT>
 
 
diff --git a/modeling/AVATAR/FutureAirNavigationSystem.xml b/modeling/AVATAR/FutureAirNavigationSystem.xml
index 611fc01e0a56beac0310287305d714586ffca171..c045e8c0a0fca0c7b18b11dd4893c6fc2d065765 100644
--- a/modeling/AVATAR/FutureAirNavigationSystem.xml
+++ b/modeling/AVATAR/FutureAirNavigationSystem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="6" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="Avatar Methodology" nameTab="Methodology" >
 <AvatarMethodologyDiagramPanel name="Methodology" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
@@ -30,19 +30,19 @@
 </COMPONENT>
 <SUBCOMPONENT type="5607" id="6" >
 <father id="13" num="0" />
-<cdparam x="366" y="488" />
+<cdparam x="366" y="473" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="366" maxX="366" minY="488" maxY="488" />
-<infoparam name="value " value="Design_lossy" />
+<cdrectangleparam minX="366" maxX="366" minY="473" maxY="473" />
+<infoparam name="value " value="Design_unlossy" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5607" id="7" >
 <father id="13" num="1" />
-<cdparam x="366" y="473" />
+<cdparam x="366" y="488" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="366" maxX="366" minY="473" maxY="473" />
-<infoparam name="value " value="Design_unlossy" />
+<cdrectangleparam minX="366" maxX="366" minY="488" maxY="488" />
+<infoparam name="value " value="Design_lossy" />
 </SUBCOMPONENT>
 
 <COMPONENT type="5603" id="21" >
@@ -59,19 +59,19 @@
 </COMPONENT>
 <SUBCOMPONENT type="5607" id="14" >
 <father id="21" num="0" />
-<cdparam x="264" y="395" />
+<cdparam x="264" y="380" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="264" maxX="264" minY="395" maxY="395" />
-<infoparam name="value " value="Analysis_lossy" />
+<cdrectangleparam minX="264" maxX="264" minY="380" maxY="380" />
+<infoparam name="value " value="Analysis_unlossy" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5607" id="15" >
 <father id="21" num="1" />
-<cdparam x="264" y="380" />
+<cdparam x="264" y="395" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="264" maxX="264" minY="380" maxY="380" />
-<infoparam name="value " value="Analysis_unlossy" />
+<cdrectangleparam minX="264" maxX="264" minY="395" maxY="395" />
+<infoparam name="value " value="Analysis_lossy" />
 </SUBCOMPONENT>
 
 <COMPONENT type="5602" id="29" >
@@ -198,7 +198,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="61" >
 <father id="64" num="0" />
 <cdparam x="422" y="574" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
@@ -217,7 +217,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="65" >
 <father id="68" num="0" />
 <cdparam x="320" y="474" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
@@ -236,7 +236,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="69" >
 <father id="72" num="0" />
 <cdparam x="220" y="380" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
@@ -255,7 +255,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="73" >
 <father id="76" num="0" />
 <cdparam x="120" y="274" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
@@ -664,7 +664,7 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
 <TGConnectingPoint num="0" id="274" />
-<P1  x="175" y="105" id="366" />
+<P1  x="175" y="105" id="392" />
 <P2  x="445" y="214" id="317" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -673,7 +673,7 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
 <TGConnectingPoint num="0" id="276" />
-<P1  x="175" y="158" id="385" />
+<P1  x="175" y="158" id="359" />
 <P2  x="379" y="125" id="341" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -682,7 +682,7 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
 <TGConnectingPoint num="0" id="278" />
-<P1  x="175" y="95" id="359" />
+<P1  x="175" y="95" id="385" />
 <P2  x="379" y="95" id="338" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -845,11 +845,11 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="369" >
 <father id="420" num="0" />
-<cdparam x="75" y="75" />
+<cdparam x="75" y="138" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="114" minY="0" maxY="240" />
-<infoparam name="TGComponent" value="INconreq" />
+<infoparam name="TGComponent" value="INconconf" />
 <TGConnectingPoint num="0" id="357" />
 <TGConnectingPoint num="1" id="358" />
 <TGConnectingPoint num="2" id="359" />
@@ -885,11 +885,11 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="395" >
 <father id="420" num="2" />
-<cdparam x="75" y="138" />
+<cdparam x="75" y="75" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="114" minY="0" maxY="240" />
-<infoparam name="TGComponent" value="INconconf" />
+<infoparam name="TGComponent" value="INconreq" />
 <TGConnectingPoint num="0" id="383" />
 <TGConnectingPoint num="1" id="384" />
 <TGConnectingPoint num="2" id="385" />
@@ -2146,148 +2146,148 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 </UseCaseDiagramPanel>
 
 <SequenceDiagramPanel name="Nominal_Service" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="606" id="1246" >
+<COMPONENT type="606" id="1243" >
 <cdparam x="513" y="64" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Controller" value="AirTrafficController" />
-<TGConnectingPoint num="0" id="1222" />
-<TGConnectingPoint num="1" id="1223" />
-<TGConnectingPoint num="2" id="1224" />
-<TGConnectingPoint num="3" id="1225" />
-<TGConnectingPoint num="4" id="1226" />
-<TGConnectingPoint num="5" id="1227" />
-<TGConnectingPoint num="6" id="1228" />
-<TGConnectingPoint num="7" id="1229" />
-<TGConnectingPoint num="8" id="1230" />
-<TGConnectingPoint num="9" id="1231" />
-<TGConnectingPoint num="10" id="1232" />
-<TGConnectingPoint num="11" id="1233" />
-<TGConnectingPoint num="12" id="1234" />
-<TGConnectingPoint num="13" id="1235" />
-<TGConnectingPoint num="14" id="1236" />
-<TGConnectingPoint num="15" id="1237" />
-<TGConnectingPoint num="16" id="1238" />
-<TGConnectingPoint num="17" id="1239" />
-<TGConnectingPoint num="18" id="1240" />
-<TGConnectingPoint num="19" id="1241" />
-<TGConnectingPoint num="20" id="1242" />
-<TGConnectingPoint num="21" id="1243" />
-<TGConnectingPoint num="22" id="1244" />
-<TGConnectingPoint num="23" id="1245" />
+<TGConnectingPoint num="0" id="1219" />
+<TGConnectingPoint num="1" id="1220" />
+<TGConnectingPoint num="2" id="1221" />
+<TGConnectingPoint num="3" id="1222" />
+<TGConnectingPoint num="4" id="1223" />
+<TGConnectingPoint num="5" id="1224" />
+<TGConnectingPoint num="6" id="1225" />
+<TGConnectingPoint num="7" id="1226" />
+<TGConnectingPoint num="8" id="1227" />
+<TGConnectingPoint num="9" id="1228" />
+<TGConnectingPoint num="10" id="1229" />
+<TGConnectingPoint num="11" id="1230" />
+<TGConnectingPoint num="12" id="1231" />
+<TGConnectingPoint num="13" id="1232" />
+<TGConnectingPoint num="14" id="1233" />
+<TGConnectingPoint num="15" id="1234" />
+<TGConnectingPoint num="16" id="1235" />
+<TGConnectingPoint num="17" id="1236" />
+<TGConnectingPoint num="18" id="1237" />
+<TGConnectingPoint num="19" id="1238" />
+<TGConnectingPoint num="20" id="1239" />
+<TGConnectingPoint num="21" id="1240" />
+<TGConnectingPoint num="22" id="1241" />
+<TGConnectingPoint num="23" id="1242" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1271" >
+<COMPONENT type="606" id="1268" >
 <cdparam x="280" y="64" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CommunicationSystem" value="FANS_Pilot_ATC_Communication_System" />
-<TGConnectingPoint num="0" id="1247" />
-<TGConnectingPoint num="1" id="1248" />
-<TGConnectingPoint num="2" id="1249" />
-<TGConnectingPoint num="3" id="1250" />
-<TGConnectingPoint num="4" id="1251" />
-<TGConnectingPoint num="5" id="1252" />
-<TGConnectingPoint num="6" id="1253" />
-<TGConnectingPoint num="7" id="1254" />
-<TGConnectingPoint num="8" id="1255" />
-<TGConnectingPoint num="9" id="1256" />
-<TGConnectingPoint num="10" id="1257" />
-<TGConnectingPoint num="11" id="1258" />
-<TGConnectingPoint num="12" id="1259" />
-<TGConnectingPoint num="13" id="1260" />
-<TGConnectingPoint num="14" id="1261" />
-<TGConnectingPoint num="15" id="1262" />
-<TGConnectingPoint num="16" id="1263" />
-<TGConnectingPoint num="17" id="1264" />
-<TGConnectingPoint num="18" id="1265" />
-<TGConnectingPoint num="19" id="1266" />
-<TGConnectingPoint num="20" id="1267" />
-<TGConnectingPoint num="21" id="1268" />
-<TGConnectingPoint num="22" id="1269" />
-<TGConnectingPoint num="23" id="1270" />
+<TGConnectingPoint num="0" id="1244" />
+<TGConnectingPoint num="1" id="1245" />
+<TGConnectingPoint num="2" id="1246" />
+<TGConnectingPoint num="3" id="1247" />
+<TGConnectingPoint num="4" id="1248" />
+<TGConnectingPoint num="5" id="1249" />
+<TGConnectingPoint num="6" id="1250" />
+<TGConnectingPoint num="7" id="1251" />
+<TGConnectingPoint num="8" id="1252" />
+<TGConnectingPoint num="9" id="1253" />
+<TGConnectingPoint num="10" id="1254" />
+<TGConnectingPoint num="11" id="1255" />
+<TGConnectingPoint num="12" id="1256" />
+<TGConnectingPoint num="13" id="1257" />
+<TGConnectingPoint num="14" id="1258" />
+<TGConnectingPoint num="15" id="1259" />
+<TGConnectingPoint num="16" id="1260" />
+<TGConnectingPoint num="17" id="1261" />
+<TGConnectingPoint num="18" id="1262" />
+<TGConnectingPoint num="19" id="1263" />
+<TGConnectingPoint num="20" id="1264" />
+<TGConnectingPoint num="21" id="1265" />
+<TGConnectingPoint num="22" id="1266" />
+<TGConnectingPoint num="23" id="1267" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1296" >
+<COMPONENT type="606" id="1293" >
 <cdparam x="60" y="64" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Pilot" value="Pilot" />
-<TGConnectingPoint num="0" id="1272" />
-<TGConnectingPoint num="1" id="1273" />
-<TGConnectingPoint num="2" id="1274" />
-<TGConnectingPoint num="3" id="1275" />
-<TGConnectingPoint num="4" id="1276" />
-<TGConnectingPoint num="5" id="1277" />
-<TGConnectingPoint num="6" id="1278" />
-<TGConnectingPoint num="7" id="1279" />
-<TGConnectingPoint num="8" id="1280" />
-<TGConnectingPoint num="9" id="1281" />
-<TGConnectingPoint num="10" id="1282" />
-<TGConnectingPoint num="11" id="1283" />
-<TGConnectingPoint num="12" id="1284" />
-<TGConnectingPoint num="13" id="1285" />
-<TGConnectingPoint num="14" id="1286" />
-<TGConnectingPoint num="15" id="1287" />
-<TGConnectingPoint num="16" id="1288" />
-<TGConnectingPoint num="17" id="1289" />
-<TGConnectingPoint num="18" id="1290" />
-<TGConnectingPoint num="19" id="1291" />
-<TGConnectingPoint num="20" id="1292" />
-<TGConnectingPoint num="21" id="1293" />
-<TGConnectingPoint num="22" id="1294" />
-<TGConnectingPoint num="23" id="1295" />
+<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="2" id="1271" />
+<TGConnectingPoint num="3" id="1272" />
+<TGConnectingPoint num="4" id="1273" />
+<TGConnectingPoint num="5" id="1274" />
+<TGConnectingPoint num="6" id="1275" />
+<TGConnectingPoint num="7" id="1276" />
+<TGConnectingPoint num="8" id="1277" />
+<TGConnectingPoint num="9" id="1278" />
+<TGConnectingPoint num="10" id="1279" />
+<TGConnectingPoint num="11" id="1280" />
+<TGConnectingPoint num="12" id="1281" />
+<TGConnectingPoint num="13" id="1282" />
+<TGConnectingPoint num="14" id="1283" />
+<TGConnectingPoint num="15" id="1284" />
+<TGConnectingPoint num="16" id="1285" />
+<TGConnectingPoint num="17" id="1286" />
+<TGConnectingPoint num="18" id="1287" />
+<TGConnectingPoint num="19" id="1288" />
+<TGConnectingPoint num="20" id="1289" />
+<TGConnectingPoint num="21" id="1290" />
+<TGConnectingPoint num="22" id="1291" />
+<TGConnectingPoint num="23" id="1292" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="107" id="1297" >
+<CONNECTOR type="107" id="1294" >
 <cdparam x="235" y="184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconconf" />
-<P1  x="285" y="184" id="1258" />
-<P2  x="65" y="184" id="1283" />
+<P1  x="285" y="184" id="1255" />
+<P2  x="65" y="184" id="1280" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1298" >
+<CONNECTOR type="107" id="1295" >
 <cdparam x="385" y="154" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconresp" />
-<P1  x="518" y="154" id="1230" />
-<P2  x="285" y="154" id="1255" />
+<P1  x="518" y="154" id="1227" />
+<P2  x="285" y="154" id="1252" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1299" >
+<CONNECTOR type="107" id="1296" >
 <cdparam x="235" y="124" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconind" />
-<P1  x="285" y="124" id="1252" />
-<P2  x="518" y="124" id="1227" />
+<P1  x="285" y="124" id="1249" />
+<P2  x="518" y="124" id="1224" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1300" >
+<CONNECTOR type="107" id="1297" >
 <cdparam x="85" y="104" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconreq" />
-<P1  x="65" y="104" id="1275" />
-<P2  x="285" y="104" id="1250" />
+<P1  x="65" y="104" id="1272" />
+<P2  x="285" y="104" id="1247" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </SequenceDiagramPanel>
 
 <SequenceDiagramPanel name="Nominal_Protocol" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="301" id="1317" >
+<COMPONENT type="301" id="1314" >
 <cdparam x="135" y="360" />
 <sizeparam width="596" height="63" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2298,22 +2298,22 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
  Basic arrows: the protocol layer communicates via FIFO queues with the network service it relies on.
     
 " />
-<TGConnectingPoint num="0" id="1301" />
-<TGConnectingPoint num="1" id="1302" />
-<TGConnectingPoint num="2" id="1303" />
-<TGConnectingPoint num="3" id="1304" />
-<TGConnectingPoint num="4" id="1305" />
-<TGConnectingPoint num="5" id="1306" />
-<TGConnectingPoint num="6" id="1307" />
-<TGConnectingPoint num="7" id="1308" />
-<TGConnectingPoint num="8" id="1309" />
-<TGConnectingPoint num="9" id="1310" />
-<TGConnectingPoint num="10" id="1311" />
-<TGConnectingPoint num="11" id="1312" />
-<TGConnectingPoint num="12" id="1313" />
-<TGConnectingPoint num="13" id="1314" />
-<TGConnectingPoint num="14" id="1315" />
-<TGConnectingPoint num="15" id="1316" />
+<TGConnectingPoint num="0" id="1298" />
+<TGConnectingPoint num="1" id="1299" />
+<TGConnectingPoint num="2" id="1300" />
+<TGConnectingPoint num="3" id="1301" />
+<TGConnectingPoint num="4" id="1302" />
+<TGConnectingPoint num="5" id="1303" />
+<TGConnectingPoint num="6" id="1304" />
+<TGConnectingPoint num="7" id="1305" />
+<TGConnectingPoint num="8" id="1306" />
+<TGConnectingPoint num="9" id="1307" />
+<TGConnectingPoint num="10" id="1308" />
+<TGConnectingPoint num="11" id="1309" />
+<TGConnectingPoint num="12" id="1310" />
+<TGConnectingPoint num="13" id="1311" />
+<TGConnectingPoint num="14" id="1312" />
+<TGConnectingPoint num="15" id="1313" />
 <extraparam>
 <Line value="" />
 <Line value=" Black arrows: the protocol layer communicates by rendezvous with its upper layer." />
@@ -2323,243 +2323,243 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1342" >
+<COMPONENT type="606" id="1339" >
 <cdparam x="502" y="78" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="GroundCommunication" value="GroundCommunication" />
-<TGConnectingPoint num="0" id="1318" />
-<TGConnectingPoint num="1" id="1319" />
-<TGConnectingPoint num="2" id="1320" />
-<TGConnectingPoint num="3" id="1321" />
-<TGConnectingPoint num="4" id="1322" />
-<TGConnectingPoint num="5" id="1323" />
-<TGConnectingPoint num="6" id="1324" />
-<TGConnectingPoint num="7" id="1325" />
-<TGConnectingPoint num="8" id="1326" />
-<TGConnectingPoint num="9" id="1327" />
-<TGConnectingPoint num="10" id="1328" />
-<TGConnectingPoint num="11" id="1329" />
-<TGConnectingPoint num="12" id="1330" />
-<TGConnectingPoint num="13" id="1331" />
-<TGConnectingPoint num="14" id="1332" />
-<TGConnectingPoint num="15" id="1333" />
-<TGConnectingPoint num="16" id="1334" />
-<TGConnectingPoint num="17" id="1335" />
-<TGConnectingPoint num="18" id="1336" />
-<TGConnectingPoint num="19" id="1337" />
-<TGConnectingPoint num="20" id="1338" />
-<TGConnectingPoint num="21" id="1339" />
-<TGConnectingPoint num="22" id="1340" />
-<TGConnectingPoint num="23" id="1341" />
+<TGConnectingPoint num="0" id="1315" />
+<TGConnectingPoint num="1" id="1316" />
+<TGConnectingPoint num="2" id="1317" />
+<TGConnectingPoint num="3" id="1318" />
+<TGConnectingPoint num="4" id="1319" />
+<TGConnectingPoint num="5" id="1320" />
+<TGConnectingPoint num="6" id="1321" />
+<TGConnectingPoint num="7" id="1322" />
+<TGConnectingPoint num="8" id="1323" />
+<TGConnectingPoint num="9" id="1324" />
+<TGConnectingPoint num="10" id="1325" />
+<TGConnectingPoint num="11" id="1326" />
+<TGConnectingPoint num="12" id="1327" />
+<TGConnectingPoint num="13" id="1328" />
+<TGConnectingPoint num="14" id="1329" />
+<TGConnectingPoint num="15" id="1330" />
+<TGConnectingPoint num="16" id="1331" />
+<TGConnectingPoint num="17" id="1332" />
+<TGConnectingPoint num="18" id="1333" />
+<TGConnectingPoint num="19" id="1334" />
+<TGConnectingPoint num="20" id="1335" />
+<TGConnectingPoint num="21" id="1336" />
+<TGConnectingPoint num="22" id="1337" />
+<TGConnectingPoint num="23" id="1338" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1367" >
+<COMPONENT type="606" id="1364" >
 <cdparam x="343" y="78" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Network" value="Network" />
-<TGConnectingPoint num="0" id="1343" />
-<TGConnectingPoint num="1" id="1344" />
-<TGConnectingPoint num="2" id="1345" />
-<TGConnectingPoint num="3" id="1346" />
-<TGConnectingPoint num="4" id="1347" />
-<TGConnectingPoint num="5" id="1348" />
-<TGConnectingPoint num="6" id="1349" />
-<TGConnectingPoint num="7" id="1350" />
-<TGConnectingPoint num="8" id="1351" />
-<TGConnectingPoint num="9" id="1352" />
-<TGConnectingPoint num="10" id="1353" />
-<TGConnectingPoint num="11" id="1354" />
-<TGConnectingPoint num="12" id="1355" />
-<TGConnectingPoint num="13" id="1356" />
-<TGConnectingPoint num="14" id="1357" />
-<TGConnectingPoint num="15" id="1358" />
-<TGConnectingPoint num="16" id="1359" />
-<TGConnectingPoint num="17" id="1360" />
-<TGConnectingPoint num="18" id="1361" />
-<TGConnectingPoint num="19" id="1362" />
-<TGConnectingPoint num="20" id="1363" />
-<TGConnectingPoint num="21" id="1364" />
-<TGConnectingPoint num="22" id="1365" />
-<TGConnectingPoint num="23" id="1366" />
+<TGConnectingPoint num="0" id="1340" />
+<TGConnectingPoint num="1" id="1341" />
+<TGConnectingPoint num="2" id="1342" />
+<TGConnectingPoint num="3" id="1343" />
+<TGConnectingPoint num="4" id="1344" />
+<TGConnectingPoint num="5" id="1345" />
+<TGConnectingPoint num="6" id="1346" />
+<TGConnectingPoint num="7" id="1347" />
+<TGConnectingPoint num="8" id="1348" />
+<TGConnectingPoint num="9" id="1349" />
+<TGConnectingPoint num="10" id="1350" />
+<TGConnectingPoint num="11" id="1351" />
+<TGConnectingPoint num="12" id="1352" />
+<TGConnectingPoint num="13" id="1353" />
+<TGConnectingPoint num="14" id="1354" />
+<TGConnectingPoint num="15" id="1355" />
+<TGConnectingPoint num="16" id="1356" />
+<TGConnectingPoint num="17" id="1357" />
+<TGConnectingPoint num="18" id="1358" />
+<TGConnectingPoint num="19" id="1359" />
+<TGConnectingPoint num="20" id="1360" />
+<TGConnectingPoint num="21" id="1361" />
+<TGConnectingPoint num="22" id="1362" />
+<TGConnectingPoint num="23" id="1363" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1392" >
+<COMPONENT type="606" id="1389" >
 <cdparam x="199" y="78" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="OnboardCommunication" value="OnboardCommunication" />
-<TGConnectingPoint num="0" id="1368" />
-<TGConnectingPoint num="1" id="1369" />
-<TGConnectingPoint num="2" id="1370" />
-<TGConnectingPoint num="3" id="1371" />
-<TGConnectingPoint num="4" id="1372" />
-<TGConnectingPoint num="5" id="1373" />
-<TGConnectingPoint num="6" id="1374" />
-<TGConnectingPoint num="7" id="1375" />
-<TGConnectingPoint num="8" id="1376" />
-<TGConnectingPoint num="9" id="1377" />
-<TGConnectingPoint num="10" id="1378" />
-<TGConnectingPoint num="11" id="1379" />
-<TGConnectingPoint num="12" id="1380" />
-<TGConnectingPoint num="13" id="1381" />
-<TGConnectingPoint num="14" id="1382" />
-<TGConnectingPoint num="15" id="1383" />
-<TGConnectingPoint num="16" id="1384" />
-<TGConnectingPoint num="17" id="1385" />
-<TGConnectingPoint num="18" id="1386" />
-<TGConnectingPoint num="19" id="1387" />
-<TGConnectingPoint num="20" id="1388" />
-<TGConnectingPoint num="21" id="1389" />
-<TGConnectingPoint num="22" id="1390" />
-<TGConnectingPoint num="23" id="1391" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
+<TGConnectingPoint num="2" id="1367" />
+<TGConnectingPoint num="3" id="1368" />
+<TGConnectingPoint num="4" id="1369" />
+<TGConnectingPoint num="5" id="1370" />
+<TGConnectingPoint num="6" id="1371" />
+<TGConnectingPoint num="7" id="1372" />
+<TGConnectingPoint num="8" id="1373" />
+<TGConnectingPoint num="9" id="1374" />
+<TGConnectingPoint num="10" id="1375" />
+<TGConnectingPoint num="11" id="1376" />
+<TGConnectingPoint num="12" id="1377" />
+<TGConnectingPoint num="13" id="1378" />
+<TGConnectingPoint num="14" id="1379" />
+<TGConnectingPoint num="15" id="1380" />
+<TGConnectingPoint num="16" id="1381" />
+<TGConnectingPoint num="17" id="1382" />
+<TGConnectingPoint num="18" id="1383" />
+<TGConnectingPoint num="19" id="1384" />
+<TGConnectingPoint num="20" id="1385" />
+<TGConnectingPoint num="21" id="1386" />
+<TGConnectingPoint num="22" id="1387" />
+<TGConnectingPoint num="23" id="1388" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1417" >
+<COMPONENT type="606" id="1414" >
 <cdparam x="680" y="78" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Controller" value="AirTrafficController" />
-<TGConnectingPoint num="0" id="1393" />
-<TGConnectingPoint num="1" id="1394" />
-<TGConnectingPoint num="2" id="1395" />
-<TGConnectingPoint num="3" id="1396" />
-<TGConnectingPoint num="4" id="1397" />
-<TGConnectingPoint num="5" id="1398" />
-<TGConnectingPoint num="6" id="1399" />
-<TGConnectingPoint num="7" id="1400" />
-<TGConnectingPoint num="8" id="1401" />
-<TGConnectingPoint num="9" id="1402" />
-<TGConnectingPoint num="10" id="1403" />
-<TGConnectingPoint num="11" id="1404" />
-<TGConnectingPoint num="12" id="1405" />
-<TGConnectingPoint num="13" id="1406" />
-<TGConnectingPoint num="14" id="1407" />
-<TGConnectingPoint num="15" id="1408" />
-<TGConnectingPoint num="16" id="1409" />
-<TGConnectingPoint num="17" id="1410" />
-<TGConnectingPoint num="18" id="1411" />
-<TGConnectingPoint num="19" id="1412" />
-<TGConnectingPoint num="20" id="1413" />
-<TGConnectingPoint num="21" id="1414" />
-<TGConnectingPoint num="22" id="1415" />
-<TGConnectingPoint num="23" id="1416" />
+<TGConnectingPoint num="0" id="1390" />
+<TGConnectingPoint num="1" id="1391" />
+<TGConnectingPoint num="2" id="1392" />
+<TGConnectingPoint num="3" id="1393" />
+<TGConnectingPoint num="4" id="1394" />
+<TGConnectingPoint num="5" id="1395" />
+<TGConnectingPoint num="6" id="1396" />
+<TGConnectingPoint num="7" id="1397" />
+<TGConnectingPoint num="8" id="1398" />
+<TGConnectingPoint num="9" id="1399" />
+<TGConnectingPoint num="10" id="1400" />
+<TGConnectingPoint num="11" id="1401" />
+<TGConnectingPoint num="12" id="1402" />
+<TGConnectingPoint num="13" id="1403" />
+<TGConnectingPoint num="14" id="1404" />
+<TGConnectingPoint num="15" id="1405" />
+<TGConnectingPoint num="16" id="1406" />
+<TGConnectingPoint num="17" id="1407" />
+<TGConnectingPoint num="18" id="1408" />
+<TGConnectingPoint num="19" id="1409" />
+<TGConnectingPoint num="20" id="1410" />
+<TGConnectingPoint num="21" id="1411" />
+<TGConnectingPoint num="22" id="1412" />
+<TGConnectingPoint num="23" id="1413" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1442" >
+<COMPONENT type="606" id="1439" >
 <cdparam x="36" y="78" />
 <sizeparam width="10" height="250" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Pilot" value="Pilot" />
-<TGConnectingPoint num="0" id="1418" />
-<TGConnectingPoint num="1" id="1419" />
-<TGConnectingPoint num="2" id="1420" />
-<TGConnectingPoint num="3" id="1421" />
-<TGConnectingPoint num="4" id="1422" />
-<TGConnectingPoint num="5" id="1423" />
-<TGConnectingPoint num="6" id="1424" />
-<TGConnectingPoint num="7" id="1425" />
-<TGConnectingPoint num="8" id="1426" />
-<TGConnectingPoint num="9" id="1427" />
-<TGConnectingPoint num="10" id="1428" />
-<TGConnectingPoint num="11" id="1429" />
-<TGConnectingPoint num="12" id="1430" />
-<TGConnectingPoint num="13" id="1431" />
-<TGConnectingPoint num="14" id="1432" />
-<TGConnectingPoint num="15" id="1433" />
-<TGConnectingPoint num="16" id="1434" />
-<TGConnectingPoint num="17" id="1435" />
-<TGConnectingPoint num="18" id="1436" />
-<TGConnectingPoint num="19" id="1437" />
-<TGConnectingPoint num="20" id="1438" />
-<TGConnectingPoint num="21" id="1439" />
-<TGConnectingPoint num="22" id="1440" />
-<TGConnectingPoint num="23" id="1441" />
+<TGConnectingPoint num="0" id="1415" />
+<TGConnectingPoint num="1" id="1416" />
+<TGConnectingPoint num="2" id="1417" />
+<TGConnectingPoint num="3" id="1418" />
+<TGConnectingPoint num="4" id="1419" />
+<TGConnectingPoint num="5" id="1420" />
+<TGConnectingPoint num="6" id="1421" />
+<TGConnectingPoint num="7" id="1422" />
+<TGConnectingPoint num="8" id="1423" />
+<TGConnectingPoint num="9" id="1424" />
+<TGConnectingPoint num="10" id="1425" />
+<TGConnectingPoint num="11" id="1426" />
+<TGConnectingPoint num="12" id="1427" />
+<TGConnectingPoint num="13" id="1428" />
+<TGConnectingPoint num="14" id="1429" />
+<TGConnectingPoint num="15" id="1430" />
+<TGConnectingPoint num="16" id="1431" />
+<TGConnectingPoint num="17" id="1432" />
+<TGConnectingPoint num="18" id="1433" />
+<TGConnectingPoint num="19" id="1434" />
+<TGConnectingPoint num="20" id="1435" />
+<TGConnectingPoint num="21" id="1436" />
+<TGConnectingPoint num="22" id="1437" />
+<TGConnectingPoint num="23" id="1438" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="106" id="1443" >
+<CONNECTOR type="106" id="1440" >
 <cdparam x="348" y="258" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="348" y="258" id="1360" />
-<P2  x="204" y="258" id="1385" />
+<P1  x="348" y="258" id="1357" />
+<P2  x="204" y="258" id="1382" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1444" >
+<CONNECTOR type="106" id="1441" >
 <cdparam x="507" y="228" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="507" y="228" id="1332" />
-<P2  x="348" y="228" id="1357" />
+<P1  x="507" y="228" id="1329" />
+<P2  x="348" y="228" id="1354" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1445" >
+<CONNECTOR type="106" id="1442" >
 <cdparam x="348" y="148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="348" y="148" id="1349" />
-<P2  x="507" y="148" id="1324" />
+<P1  x="348" y="148" id="1346" />
+<P2  x="507" y="148" id="1321" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1446" >
+<CONNECTOR type="106" id="1443" >
 <cdparam x="204" y="128" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="204" y="128" id="1372" />
-<P2  x="348" y="128" id="1347" />
+<P1  x="204" y="128" id="1369" />
+<P2  x="348" y="128" id="1344" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1447" >
+<CONNECTOR type="107" id="1444" >
 <cdparam x="12" y="115" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="conreq" />
-<P1  x="41" y="108" id="1420" />
-<P2  x="204" y="108" id="1370" />
+<P1  x="41" y="108" id="1417" />
+<P2  x="204" y="108" id="1367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1448" >
+<CONNECTOR type="107" id="1445" >
 <cdparam x="202" y="280" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="conconf" />
-<P1  x="204" y="278" id="1387" />
-<P2  x="41" y="278" id="1437" />
+<P1  x="204" y="278" id="1384" />
+<P2  x="41" y="278" id="1434" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1449" >
+<CONNECTOR type="107" id="1446" >
 <cdparam x="685" y="199" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="conresp" />
-<P1  x="685" y="198" id="1404" />
-<P2  x="507" y="198" id="1329" />
+<P1  x="685" y="198" id="1401" />
+<P2  x="507" y="198" id="1326" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1450" >
+<CONNECTOR type="107" id="1447" >
 <cdparam x="507" y="169" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="conind" />
-<P1  x="507" y="168" id="1326" />
-<P2  x="685" y="168" id="1401" />
+<P1  x="507" y="168" id="1323" />
+<P2  x="685" y="168" id="1398" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -2572,765 +2572,765 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 
 <Modeling type="Avatar Analysis" nameTab="Analysis_lossy" >
 <UseCaseDiagramPanel name="Use Case Diagram" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="703" id="1483" >
+<COMPONENT type="703" id="1480" >
 <cdparam x="171" y="157" />
 <sizeparam width="74" height="50" minWidth="40" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="actor" value="Network" />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
-<TGConnectingPoint num="2" id="1453" />
-<TGConnectingPoint num="3" id="1454" />
-<TGConnectingPoint num="4" id="1455" />
-<TGConnectingPoint num="5" id="1456" />
-<TGConnectingPoint num="6" id="1457" />
-<TGConnectingPoint num="7" id="1458" />
-<TGConnectingPoint num="8" id="1459" />
-<TGConnectingPoint num="9" id="1460" />
-<TGConnectingPoint num="10" id="1461" />
-<TGConnectingPoint num="11" id="1462" />
-<TGConnectingPoint num="12" id="1463" />
-<TGConnectingPoint num="13" id="1464" />
-<TGConnectingPoint num="14" id="1465" />
-<TGConnectingPoint num="15" id="1466" />
-<TGConnectingPoint num="16" id="1467" />
-<TGConnectingPoint num="17" id="1468" />
-<TGConnectingPoint num="18" id="1469" />
-<TGConnectingPoint num="19" id="1470" />
-<TGConnectingPoint num="20" id="1471" />
-<TGConnectingPoint num="21" id="1472" />
-<TGConnectingPoint num="22" id="1473" />
-<TGConnectingPoint num="23" id="1474" />
-<TGConnectingPoint num="24" id="1475" />
-<TGConnectingPoint num="25" id="1476" />
-<TGConnectingPoint num="26" id="1477" />
-<TGConnectingPoint num="27" id="1478" />
-<TGConnectingPoint num="28" id="1479" />
-<TGConnectingPoint num="29" id="1480" />
-<TGConnectingPoint num="30" id="1481" />
-<TGConnectingPoint num="31" id="1482" />
-</COMPONENT>
-
-<COMPONENT type="700" id="1516" >
+<TGConnectingPoint num="0" id="1448" />
+<TGConnectingPoint num="1" id="1449" />
+<TGConnectingPoint num="2" id="1450" />
+<TGConnectingPoint num="3" id="1451" />
+<TGConnectingPoint num="4" id="1452" />
+<TGConnectingPoint num="5" id="1453" />
+<TGConnectingPoint num="6" id="1454" />
+<TGConnectingPoint num="7" id="1455" />
+<TGConnectingPoint num="8" id="1456" />
+<TGConnectingPoint num="9" id="1457" />
+<TGConnectingPoint num="10" id="1458" />
+<TGConnectingPoint num="11" id="1459" />
+<TGConnectingPoint num="12" id="1460" />
+<TGConnectingPoint num="13" id="1461" />
+<TGConnectingPoint num="14" id="1462" />
+<TGConnectingPoint num="15" id="1463" />
+<TGConnectingPoint num="16" id="1464" />
+<TGConnectingPoint num="17" id="1465" />
+<TGConnectingPoint num="18" id="1466" />
+<TGConnectingPoint num="19" id="1467" />
+<TGConnectingPoint num="20" id="1468" />
+<TGConnectingPoint num="21" id="1469" />
+<TGConnectingPoint num="22" id="1470" />
+<TGConnectingPoint num="23" id="1471" />
+<TGConnectingPoint num="24" id="1472" />
+<TGConnectingPoint num="25" id="1473" />
+<TGConnectingPoint num="26" id="1474" />
+<TGConnectingPoint num="27" id="1475" />
+<TGConnectingPoint num="28" id="1476" />
+<TGConnectingPoint num="29" id="1477" />
+<TGConnectingPoint num="30" id="1478" />
+<TGConnectingPoint num="31" id="1479" />
+</COMPONENT>
+
+<COMPONENT type="700" id="1513" >
 <cdparam x="342" y="55" />
 <sizeparam width="30" height="70" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="actor" value="Controller" />
-<TGConnectingPoint num="0" id="1484" />
-<TGConnectingPoint num="1" id="1485" />
-<TGConnectingPoint num="2" id="1486" />
-<TGConnectingPoint num="3" id="1487" />
-<TGConnectingPoint num="4" id="1488" />
-<TGConnectingPoint num="5" id="1489" />
-<TGConnectingPoint num="6" id="1490" />
-<TGConnectingPoint num="7" id="1491" />
-<TGConnectingPoint num="8" id="1492" />
-<TGConnectingPoint num="9" id="1493" />
-<TGConnectingPoint num="10" id="1494" />
-<TGConnectingPoint num="11" id="1495" />
-<TGConnectingPoint num="12" id="1496" />
-<TGConnectingPoint num="13" id="1497" />
-<TGConnectingPoint num="14" id="1498" />
-<TGConnectingPoint num="15" id="1499" />
-<TGConnectingPoint num="16" id="1500" />
-<TGConnectingPoint num="17" id="1501" />
-<TGConnectingPoint num="18" id="1502" />
-<TGConnectingPoint num="19" id="1503" />
-<TGConnectingPoint num="20" id="1504" />
-<TGConnectingPoint num="21" id="1505" />
-<TGConnectingPoint num="22" id="1506" />
-<TGConnectingPoint num="23" id="1507" />
-<TGConnectingPoint num="24" id="1508" />
-<TGConnectingPoint num="25" id="1509" />
-<TGConnectingPoint num="26" id="1510" />
-<TGConnectingPoint num="27" id="1511" />
-<TGConnectingPoint num="28" id="1512" />
-<TGConnectingPoint num="29" id="1513" />
-<TGConnectingPoint num="30" id="1514" />
-<TGConnectingPoint num="31" id="1515" />
-</COMPONENT>
-
-<COMPONENT type="700" id="1549" >
+<TGConnectingPoint num="0" id="1481" />
+<TGConnectingPoint num="1" id="1482" />
+<TGConnectingPoint num="2" id="1483" />
+<TGConnectingPoint num="3" id="1484" />
+<TGConnectingPoint num="4" id="1485" />
+<TGConnectingPoint num="5" id="1486" />
+<TGConnectingPoint num="6" id="1487" />
+<TGConnectingPoint num="7" id="1488" />
+<TGConnectingPoint num="8" id="1489" />
+<TGConnectingPoint num="9" id="1490" />
+<TGConnectingPoint num="10" id="1491" />
+<TGConnectingPoint num="11" id="1492" />
+<TGConnectingPoint num="12" id="1493" />
+<TGConnectingPoint num="13" id="1494" />
+<TGConnectingPoint num="14" id="1495" />
+<TGConnectingPoint num="15" id="1496" />
+<TGConnectingPoint num="16" id="1497" />
+<TGConnectingPoint num="17" id="1498" />
+<TGConnectingPoint num="18" id="1499" />
+<TGConnectingPoint num="19" id="1500" />
+<TGConnectingPoint num="20" id="1501" />
+<TGConnectingPoint num="21" id="1502" />
+<TGConnectingPoint num="22" id="1503" />
+<TGConnectingPoint num="23" id="1504" />
+<TGConnectingPoint num="24" id="1505" />
+<TGConnectingPoint num="25" id="1506" />
+<TGConnectingPoint num="26" id="1507" />
+<TGConnectingPoint num="27" id="1508" />
+<TGConnectingPoint num="28" id="1509" />
+<TGConnectingPoint num="29" id="1510" />
+<TGConnectingPoint num="30" id="1511" />
+<TGConnectingPoint num="31" id="1512" />
+</COMPONENT>
+
+<COMPONENT type="700" id="1546" >
 <cdparam x="41" y="55" />
 <sizeparam width="30" height="70" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="actor" value="Pilot" />
-<TGConnectingPoint num="0" id="1517" />
-<TGConnectingPoint num="1" id="1518" />
-<TGConnectingPoint num="2" id="1519" />
-<TGConnectingPoint num="3" id="1520" />
-<TGConnectingPoint num="4" id="1521" />
-<TGConnectingPoint num="5" id="1522" />
-<TGConnectingPoint num="6" id="1523" />
-<TGConnectingPoint num="7" id="1524" />
-<TGConnectingPoint num="8" id="1525" />
-<TGConnectingPoint num="9" id="1526" />
-<TGConnectingPoint num="10" id="1527" />
-<TGConnectingPoint num="11" id="1528" />
-<TGConnectingPoint num="12" id="1529" />
-<TGConnectingPoint num="13" id="1530" />
-<TGConnectingPoint num="14" id="1531" />
-<TGConnectingPoint num="15" id="1532" />
-<TGConnectingPoint num="16" id="1533" />
-<TGConnectingPoint num="17" id="1534" />
-<TGConnectingPoint num="18" id="1535" />
-<TGConnectingPoint num="19" id="1536" />
-<TGConnectingPoint num="20" id="1537" />
-<TGConnectingPoint num="21" id="1538" />
-<TGConnectingPoint num="22" id="1539" />
-<TGConnectingPoint num="23" id="1540" />
-<TGConnectingPoint num="24" id="1541" />
-<TGConnectingPoint num="25" id="1542" />
-<TGConnectingPoint num="26" id="1543" />
-<TGConnectingPoint num="27" id="1544" />
-<TGConnectingPoint num="28" id="1545" />
-<TGConnectingPoint num="29" id="1546" />
-<TGConnectingPoint num="30" id="1547" />
-<TGConnectingPoint num="31" id="1548" />
-</COMPONENT>
-
-<COMPONENT type="702" id="1558" >
+<TGConnectingPoint num="0" id="1514" />
+<TGConnectingPoint num="1" id="1515" />
+<TGConnectingPoint num="2" id="1516" />
+<TGConnectingPoint num="3" id="1517" />
+<TGConnectingPoint num="4" id="1518" />
+<TGConnectingPoint num="5" id="1519" />
+<TGConnectingPoint num="6" id="1520" />
+<TGConnectingPoint num="7" id="1521" />
+<TGConnectingPoint num="8" id="1522" />
+<TGConnectingPoint num="9" id="1523" />
+<TGConnectingPoint num="10" id="1524" />
+<TGConnectingPoint num="11" id="1525" />
+<TGConnectingPoint num="12" id="1526" />
+<TGConnectingPoint num="13" id="1527" />
+<TGConnectingPoint num="14" id="1528" />
+<TGConnectingPoint num="15" id="1529" />
+<TGConnectingPoint num="16" id="1530" />
+<TGConnectingPoint num="17" id="1531" />
+<TGConnectingPoint num="18" id="1532" />
+<TGConnectingPoint num="19" id="1533" />
+<TGConnectingPoint num="20" id="1534" />
+<TGConnectingPoint num="21" id="1535" />
+<TGConnectingPoint num="22" id="1536" />
+<TGConnectingPoint num="23" id="1537" />
+<TGConnectingPoint num="24" id="1538" />
+<TGConnectingPoint num="25" id="1539" />
+<TGConnectingPoint num="26" id="1540" />
+<TGConnectingPoint num="27" id="1541" />
+<TGConnectingPoint num="28" id="1542" />
+<TGConnectingPoint num="29" id="1543" />
+<TGConnectingPoint num="30" id="1544" />
+<TGConnectingPoint num="31" id="1545" />
+</COMPONENT>
+
+<COMPONENT type="702" id="1555" >
 <cdparam x="102" y="38" />
 <sizeparam width="216" height="105" minWidth="100" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="border" value="Communication_System" />
-<TGConnectingPoint num="0" id="1550" />
-<TGConnectingPoint num="1" id="1551" />
-<TGConnectingPoint num="2" id="1552" />
-<TGConnectingPoint num="3" id="1553" />
-<TGConnectingPoint num="4" id="1554" />
-<TGConnectingPoint num="5" id="1555" />
-<TGConnectingPoint num="6" id="1556" />
-<TGConnectingPoint num="7" id="1557" />
+<TGConnectingPoint num="0" id="1547" />
+<TGConnectingPoint num="1" id="1548" />
+<TGConnectingPoint num="2" id="1549" />
+<TGConnectingPoint num="3" id="1550" />
+<TGConnectingPoint num="4" id="1551" />
+<TGConnectingPoint num="5" id="1552" />
+<TGConnectingPoint num="6" id="1553" />
+<TGConnectingPoint num="7" id="1554" />
 </COMPONENT>
 
-<CONNECTOR type="110" id="1559" >
+<CONNECTOR type="110" id="1556" >
 <cdparam x="217" y="179" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="208" y="207" id="1481" />
-<P2  x="71" y="90" id="1545" />
+<P1  x="208" y="207" id="1478" />
+<P2  x="71" y="90" id="1542" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="110" id="1560" >
+<CONNECTOR type="110" id="1557" >
 <cdparam x="257" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Use case to actor" value="null" />
-<P1  x="41" y="90" id="1544" />
-<P2  x="342" y="90" id="1511" />
+<P1  x="41" y="90" id="1541" />
+<P2  x="342" y="90" id="1508" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="110" id="1561" >
+<CONNECTOR type="110" id="1558" >
 <cdparam x="32" y="20" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from actor to Use case" value="null" />
-<P1  x="284" y="360" id="1576" />
-<P2  x="624" y="360" id="1543" />
+<P1  x="568" y="720" id="1576" />
+<P2  x="1248" y="720" id="1543" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </UseCaseDiagramPanel>
 
 <SequenceDiagramPanel name="error_service" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="301" id="1578" >
+<COMPONENT type="301" id="1575" >
 <cdparam x="231" y="215" />
 <sizeparam width="43" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="UML Note" value="Lost
 " />
-<TGConnectingPoint num="0" id="1562" />
-<TGConnectingPoint num="1" id="1563" />
-<TGConnectingPoint num="2" id="1564" />
-<TGConnectingPoint num="3" id="1565" />
-<TGConnectingPoint num="4" id="1566" />
-<TGConnectingPoint num="5" id="1567" />
-<TGConnectingPoint num="6" id="1568" />
-<TGConnectingPoint num="7" id="1569" />
-<TGConnectingPoint num="8" id="1570" />
-<TGConnectingPoint num="9" id="1571" />
-<TGConnectingPoint num="10" id="1572" />
-<TGConnectingPoint num="11" id="1573" />
-<TGConnectingPoint num="12" id="1574" />
-<TGConnectingPoint num="13" id="1575" />
-<TGConnectingPoint num="14" id="1576" />
-<TGConnectingPoint num="15" id="1577" />
+<TGConnectingPoint num="0" id="1559" />
+<TGConnectingPoint num="1" id="1560" />
+<TGConnectingPoint num="2" id="1561" />
+<TGConnectingPoint num="3" id="1562" />
+<TGConnectingPoint num="4" id="1563" />
+<TGConnectingPoint num="5" id="1564" />
+<TGConnectingPoint num="6" id="1565" />
+<TGConnectingPoint num="7" id="1566" />
+<TGConnectingPoint num="8" id="1567" />
+<TGConnectingPoint num="9" id="1568" />
+<TGConnectingPoint num="10" id="1569" />
+<TGConnectingPoint num="11" id="1570" />
+<TGConnectingPoint num="12" id="1571" />
+<TGConnectingPoint num="13" id="1572" />
+<TGConnectingPoint num="14" id="1573" />
+<TGConnectingPoint num="15" id="1574" />
 <extraparam>
 <Line value="Lost" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="601" id="1588" >
+<COMPONENT type="601" id="1585" >
 <cdparam x="208" y="261" />
 <sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1579" />
-<TGConnectingPoint num="1" id="1580" />
-<TGConnectingPoint num="2" id="1581" />
-<TGConnectingPoint num="3" id="1582" />
-<TGConnectingPoint num="4" id="1583" />
-<TGConnectingPoint num="5" id="1584" />
-<TGConnectingPoint num="6" id="1585" />
-<TGConnectingPoint num="7" id="1586" />
-<TGConnectingPoint num="8" id="1587" />
-</COMPONENT>
-
-<COMPONENT type="601" id="1598" >
+<TGConnectingPoint num="0" id="1576" />
+<TGConnectingPoint num="1" id="1577" />
+<TGConnectingPoint num="2" id="1578" />
+<TGConnectingPoint num="3" id="1579" />
+<TGConnectingPoint num="4" id="1580" />
+<TGConnectingPoint num="5" id="1581" />
+<TGConnectingPoint num="6" id="1582" />
+<TGConnectingPoint num="7" id="1583" />
+<TGConnectingPoint num="8" id="1584" />
+</COMPONENT>
+
+<COMPONENT type="601" id="1595" >
 <cdparam x="208" y="132" />
 <sizeparam width="40" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Line of relative time constraint" value="rtc" />
-<TGConnectingPoint num="0" id="1589" />
-<TGConnectingPoint num="1" id="1590" />
-<TGConnectingPoint num="2" id="1591" />
-<TGConnectingPoint num="3" id="1592" />
-<TGConnectingPoint num="4" id="1593" />
-<TGConnectingPoint num="5" id="1594" />
-<TGConnectingPoint num="6" id="1595" />
-<TGConnectingPoint num="7" id="1596" />
-<TGConnectingPoint num="8" id="1597" />
-</COMPONENT>
-
-<COMPONENT type="606" id="1624" >
+<TGConnectingPoint num="0" id="1586" />
+<TGConnectingPoint num="1" id="1587" />
+<TGConnectingPoint num="2" id="1588" />
+<TGConnectingPoint num="3" id="1589" />
+<TGConnectingPoint num="4" id="1590" />
+<TGConnectingPoint num="5" id="1591" />
+<TGConnectingPoint num="6" id="1592" />
+<TGConnectingPoint num="7" id="1593" />
+<TGConnectingPoint num="8" id="1594" />
+</COMPONENT>
+
+<COMPONENT type="606" id="1621" >
 <cdparam x="404" y="72" />
 <sizeparam width="10" height="265" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Controller" value="AirTrafficController" />
-<TGConnectingPoint num="0" id="1599" />
-<TGConnectingPoint num="1" id="1600" />
-<TGConnectingPoint num="2" id="1601" />
-<TGConnectingPoint num="3" id="1602" />
-<TGConnectingPoint num="4" id="1603" />
-<TGConnectingPoint num="5" id="1604" />
-<TGConnectingPoint num="6" id="1605" />
-<TGConnectingPoint num="7" id="1606" />
-<TGConnectingPoint num="8" id="1607" />
-<TGConnectingPoint num="9" id="1608" />
-<TGConnectingPoint num="10" id="1609" />
-<TGConnectingPoint num="11" id="1610" />
-<TGConnectingPoint num="12" id="1611" />
-<TGConnectingPoint num="13" id="1612" />
-<TGConnectingPoint num="14" id="1613" />
-<TGConnectingPoint num="15" id="1614" />
-<TGConnectingPoint num="16" id="1615" />
-<TGConnectingPoint num="17" id="1616" />
-<TGConnectingPoint num="18" id="1617" />
-<TGConnectingPoint num="19" id="1618" />
-<TGConnectingPoint num="20" id="1619" />
-<TGConnectingPoint num="21" id="1620" />
-<TGConnectingPoint num="22" id="1621" />
-<TGConnectingPoint num="23" id="1622" />
-<TGConnectingPoint num="24" id="1623" />
+<TGConnectingPoint num="0" id="1596" />
+<TGConnectingPoint num="1" id="1597" />
+<TGConnectingPoint num="2" id="1598" />
+<TGConnectingPoint num="3" id="1599" />
+<TGConnectingPoint num="4" id="1600" />
+<TGConnectingPoint num="5" id="1601" />
+<TGConnectingPoint num="6" id="1602" />
+<TGConnectingPoint num="7" id="1603" />
+<TGConnectingPoint num="8" id="1604" />
+<TGConnectingPoint num="9" id="1605" />
+<TGConnectingPoint num="10" id="1606" />
+<TGConnectingPoint num="11" id="1607" />
+<TGConnectingPoint num="12" id="1608" />
+<TGConnectingPoint num="13" id="1609" />
+<TGConnectingPoint num="14" id="1610" />
+<TGConnectingPoint num="15" id="1611" />
+<TGConnectingPoint num="16" id="1612" />
+<TGConnectingPoint num="17" id="1613" />
+<TGConnectingPoint num="18" id="1614" />
+<TGConnectingPoint num="19" id="1615" />
+<TGConnectingPoint num="20" id="1616" />
+<TGConnectingPoint num="21" id="1617" />
+<TGConnectingPoint num="22" id="1618" />
+<TGConnectingPoint num="23" id="1619" />
+<TGConnectingPoint num="24" id="1620" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1651" >
+<COMPONENT type="606" id="1648" >
 <cdparam x="231" y="72" />
 <sizeparam width="10" height="273" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CommunicationSystem" value="FANS_Pilot_ATC_Communication_System" />
-<TGConnectingPoint num="0" id="1625" />
-<TGConnectingPoint num="1" id="1626" />
-<TGConnectingPoint num="2" id="1627" />
-<TGConnectingPoint num="3" id="1628" />
-<TGConnectingPoint num="4" id="1629" />
-<TGConnectingPoint num="5" id="1630" />
-<TGConnectingPoint num="6" id="1631" />
-<TGConnectingPoint num="7" id="1632" />
-<TGConnectingPoint num="8" id="1633" />
-<TGConnectingPoint num="9" id="1634" />
-<TGConnectingPoint num="10" id="1635" />
-<TGConnectingPoint num="11" id="1636" />
-<TGConnectingPoint num="12" id="1637" />
-<TGConnectingPoint num="13" id="1638" />
-<TGConnectingPoint num="14" id="1639" />
-<TGConnectingPoint num="15" id="1640" />
-<TGConnectingPoint num="16" id="1641" />
-<TGConnectingPoint num="17" id="1642" />
-<TGConnectingPoint num="18" id="1643" />
-<TGConnectingPoint num="19" id="1644" />
-<TGConnectingPoint num="20" id="1645" />
-<TGConnectingPoint num="21" id="1646" />
-<TGConnectingPoint num="22" id="1647" />
-<TGConnectingPoint num="23" id="1648" />
-<TGConnectingPoint num="24" id="1649" />
-<TGConnectingPoint num="25" id="1650" />
+<TGConnectingPoint num="0" id="1622" />
+<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="2" id="1624" />
+<TGConnectingPoint num="3" id="1625" />
+<TGConnectingPoint num="4" id="1626" />
+<TGConnectingPoint num="5" id="1627" />
+<TGConnectingPoint num="6" id="1628" />
+<TGConnectingPoint num="7" id="1629" />
+<TGConnectingPoint num="8" id="1630" />
+<TGConnectingPoint num="9" id="1631" />
+<TGConnectingPoint num="10" id="1632" />
+<TGConnectingPoint num="11" id="1633" />
+<TGConnectingPoint num="12" id="1634" />
+<TGConnectingPoint num="13" id="1635" />
+<TGConnectingPoint num="14" id="1636" />
+<TGConnectingPoint num="15" id="1637" />
+<TGConnectingPoint num="16" id="1638" />
+<TGConnectingPoint num="17" id="1639" />
+<TGConnectingPoint num="18" id="1640" />
+<TGConnectingPoint num="19" id="1641" />
+<TGConnectingPoint num="20" id="1642" />
+<TGConnectingPoint num="21" id="1643" />
+<TGConnectingPoint num="22" id="1644" />
+<TGConnectingPoint num="23" id="1645" />
+<TGConnectingPoint num="24" id="1646" />
+<TGConnectingPoint num="25" id="1647" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1677" >
+<COMPONENT type="606" id="1674" >
 <cdparam x="45" y="72" />
 <sizeparam width="10" height="265" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Pilot" value="Pilot" />
-<TGConnectingPoint num="0" id="1652" />
-<TGConnectingPoint num="1" id="1653" />
-<TGConnectingPoint num="2" id="1654" />
-<TGConnectingPoint num="3" id="1655" />
-<TGConnectingPoint num="4" id="1656" />
-<TGConnectingPoint num="5" id="1657" />
-<TGConnectingPoint num="6" id="1658" />
-<TGConnectingPoint num="7" id="1659" />
-<TGConnectingPoint num="8" id="1660" />
-<TGConnectingPoint num="9" id="1661" />
-<TGConnectingPoint num="10" id="1662" />
-<TGConnectingPoint num="11" id="1663" />
-<TGConnectingPoint num="12" id="1664" />
-<TGConnectingPoint num="13" id="1665" />
-<TGConnectingPoint num="14" id="1666" />
-<TGConnectingPoint num="15" id="1667" />
-<TGConnectingPoint num="16" id="1668" />
-<TGConnectingPoint num="17" id="1669" />
-<TGConnectingPoint num="18" id="1670" />
-<TGConnectingPoint num="19" id="1671" />
-<TGConnectingPoint num="20" id="1672" />
-<TGConnectingPoint num="21" id="1673" />
-<TGConnectingPoint num="22" id="1674" />
-<TGConnectingPoint num="23" id="1675" />
-<TGConnectingPoint num="24" id="1676" />
+<TGConnectingPoint num="0" id="1649" />
+<TGConnectingPoint num="1" id="1650" />
+<TGConnectingPoint num="2" id="1651" />
+<TGConnectingPoint num="3" id="1652" />
+<TGConnectingPoint num="4" id="1653" />
+<TGConnectingPoint num="5" id="1654" />
+<TGConnectingPoint num="6" id="1655" />
+<TGConnectingPoint num="7" id="1656" />
+<TGConnectingPoint num="8" id="1657" />
+<TGConnectingPoint num="9" id="1658" />
+<TGConnectingPoint num="10" id="1659" />
+<TGConnectingPoint num="11" id="1660" />
+<TGConnectingPoint num="12" id="1661" />
+<TGConnectingPoint num="13" id="1662" />
+<TGConnectingPoint num="14" id="1663" />
+<TGConnectingPoint num="15" id="1664" />
+<TGConnectingPoint num="16" id="1665" />
+<TGConnectingPoint num="17" id="1666" />
+<TGConnectingPoint num="18" id="1667" />
+<TGConnectingPoint num="19" id="1668" />
+<TGConnectingPoint num="20" id="1669" />
+<TGConnectingPoint num="21" id="1670" />
+<TGConnectingPoint num="22" id="1671" />
+<TGConnectingPoint num="23" id="1672" />
+<TGConnectingPoint num="24" id="1673" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="107" id="1678" >
+<CONNECTOR type="107" id="1675" >
 <cdparam x="409" y="182" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconresp" />
-<P1  x="409" y="182" id="1609" />
-<P2  x="236" y="182" id="1635" />
+<P1  x="409" y="182" id="1606" />
+<P2  x="236" y="182" id="1632" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="109" id="1679" >
+<CONNECTOR type="109" id="1676" >
 <cdparam x="218" y="132" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="relative time constraint" value="{ATST1..ATST1}" />
-<P1  x="218" y="132" id="1589" />
-<P2  x="218" y="261" id="1579" />
+<P1  x="218" y="132" id="1586" />
+<P2  x="218" y="261" id="1576" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <Interval minConstraint="ATST1" maxConstraint="ATST1" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="107" id="1680" >
+<CONNECTOR type="107" id="1677" >
 <cdparam x="236" y="261" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INerror" />
-<P1  x="236" y="262" id="1643" />
-<P2  x="50" y="262" id="1670" />
+<P1  x="236" y="262" id="1640" />
+<P2  x="50" y="262" id="1667" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1681" >
+<CONNECTOR type="107" id="1678" >
 <cdparam x="220" y="132" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconind" />
-<P1  x="236" y="132" id="1630" />
-<P2  x="409" y="132" id="1604" />
+<P1  x="236" y="132" id="1627" />
+<P2  x="409" y="132" id="1601" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1682" >
+<CONNECTOR type="107" id="1679" >
 <cdparam x="70" y="112" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconreq" />
-<P1  x="50" y="112" id="1655" />
-<P2  x="236" y="112" id="1628" />
+<P1  x="50" y="112" id="1652" />
+<P2  x="236" y="112" id="1625" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </SequenceDiagramPanel>
 
 <SequenceDiagramPanel name="lost_and_sucessful_retransmissions" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="605" id="1691" >
+<COMPONENT type="605" id="1688" >
 <cdparam x="219" y="274" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="timer expiration" value="{timer=ATST1}" />
-<TGConnectingPoint num="0" id="1683" />
-<TGConnectingPoint num="1" id="1684" />
-<TGConnectingPoint num="2" id="1685" />
-<TGConnectingPoint num="3" id="1686" />
-<TGConnectingPoint num="4" id="1687" />
-<TGConnectingPoint num="5" id="1688" />
-<TGConnectingPoint num="6" id="1689" />
-<TGConnectingPoint num="7" id="1690" />
+<TGConnectingPoint num="0" id="1680" />
+<TGConnectingPoint num="1" id="1681" />
+<TGConnectingPoint num="2" id="1682" />
+<TGConnectingPoint num="3" id="1683" />
+<TGConnectingPoint num="4" id="1684" />
+<TGConnectingPoint num="5" id="1685" />
+<TGConnectingPoint num="6" id="1686" />
+<TGConnectingPoint num="7" id="1687" />
 <extraparam>
 <Interval timer="ATST1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="603" id="1700" >
+<COMPONENT type="603" id="1697" >
 <cdparam x="221" y="151" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
-<TGConnectingPoint num="0" id="1692" />
-<TGConnectingPoint num="1" id="1693" />
-<TGConnectingPoint num="2" id="1694" />
-<TGConnectingPoint num="3" id="1695" />
-<TGConnectingPoint num="4" id="1696" />
-<TGConnectingPoint num="5" id="1697" />
-<TGConnectingPoint num="6" id="1698" />
-<TGConnectingPoint num="7" id="1699" />
+<TGConnectingPoint num="0" id="1689" />
+<TGConnectingPoint num="1" id="1690" />
+<TGConnectingPoint num="2" id="1691" />
+<TGConnectingPoint num="3" id="1692" />
+<TGConnectingPoint num="4" id="1693" />
+<TGConnectingPoint num="5" id="1694" />
+<TGConnectingPoint num="6" id="1695" />
+<TGConnectingPoint num="7" id="1696" />
 <extraparam>
 <Interval timer="ATST1" duration="10" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1750" >
+<COMPONENT type="606" id="1747" >
 <cdparam x="620" y="86" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="330" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="GroundCommunication" value="GroundCommunication" />
-<TGConnectingPoint num="0" id="1701" />
-<TGConnectingPoint num="1" id="1702" />
-<TGConnectingPoint num="2" id="1703" />
-<TGConnectingPoint num="3" id="1704" />
-<TGConnectingPoint num="4" id="1705" />
-<TGConnectingPoint num="5" id="1706" />
-<TGConnectingPoint num="6" id="1707" />
-<TGConnectingPoint num="7" id="1708" />
-<TGConnectingPoint num="8" id="1709" />
-<TGConnectingPoint num="9" id="1710" />
-<TGConnectingPoint num="10" id="1711" />
-<TGConnectingPoint num="11" id="1712" />
-<TGConnectingPoint num="12" id="1713" />
-<TGConnectingPoint num="13" id="1714" />
-<TGConnectingPoint num="14" id="1715" />
-<TGConnectingPoint num="15" id="1716" />
-<TGConnectingPoint num="16" id="1717" />
-<TGConnectingPoint num="17" id="1718" />
-<TGConnectingPoint num="18" id="1719" />
-<TGConnectingPoint num="19" id="1720" />
-<TGConnectingPoint num="20" id="1721" />
-<TGConnectingPoint num="21" id="1722" />
-<TGConnectingPoint num="22" id="1723" />
-<TGConnectingPoint num="23" id="1724" />
-<TGConnectingPoint num="24" id="1725" />
-<TGConnectingPoint num="25" id="1726" />
-<TGConnectingPoint num="26" id="1727" />
-<TGConnectingPoint num="27" id="1728" />
-<TGConnectingPoint num="28" id="1729" />
-<TGConnectingPoint num="29" id="1730" />
-<TGConnectingPoint num="30" id="1731" />
-<TGConnectingPoint num="31" id="1732" />
-<TGConnectingPoint num="32" id="1733" />
-<TGConnectingPoint num="33" id="1734" />
-<TGConnectingPoint num="34" id="1735" />
-<TGConnectingPoint num="35" id="1736" />
-<TGConnectingPoint num="36" id="1737" />
-<TGConnectingPoint num="37" id="1738" />
-<TGConnectingPoint num="38" id="1739" />
-<TGConnectingPoint num="39" id="1740" />
-<TGConnectingPoint num="40" id="1741" />
-<TGConnectingPoint num="41" id="1742" />
-<TGConnectingPoint num="42" id="1743" />
-<TGConnectingPoint num="43" id="1744" />
-<TGConnectingPoint num="44" id="1745" />
-<TGConnectingPoint num="45" id="1746" />
-<TGConnectingPoint num="46" id="1747" />
-<TGConnectingPoint num="47" id="1748" />
-<TGConnectingPoint num="48" id="1749" />
+<TGConnectingPoint num="0" id="1698" />
+<TGConnectingPoint num="1" id="1699" />
+<TGConnectingPoint num="2" id="1700" />
+<TGConnectingPoint num="3" id="1701" />
+<TGConnectingPoint num="4" id="1702" />
+<TGConnectingPoint num="5" id="1703" />
+<TGConnectingPoint num="6" id="1704" />
+<TGConnectingPoint num="7" id="1705" />
+<TGConnectingPoint num="8" id="1706" />
+<TGConnectingPoint num="9" id="1707" />
+<TGConnectingPoint num="10" id="1708" />
+<TGConnectingPoint num="11" id="1709" />
+<TGConnectingPoint num="12" id="1710" />
+<TGConnectingPoint num="13" id="1711" />
+<TGConnectingPoint num="14" id="1712" />
+<TGConnectingPoint num="15" id="1713" />
+<TGConnectingPoint num="16" id="1714" />
+<TGConnectingPoint num="17" id="1715" />
+<TGConnectingPoint num="18" id="1716" />
+<TGConnectingPoint num="19" id="1717" />
+<TGConnectingPoint num="20" id="1718" />
+<TGConnectingPoint num="21" id="1719" />
+<TGConnectingPoint num="22" id="1720" />
+<TGConnectingPoint num="23" id="1721" />
+<TGConnectingPoint num="24" id="1722" />
+<TGConnectingPoint num="25" id="1723" />
+<TGConnectingPoint num="26" id="1724" />
+<TGConnectingPoint num="27" id="1725" />
+<TGConnectingPoint num="28" id="1726" />
+<TGConnectingPoint num="29" id="1727" />
+<TGConnectingPoint num="30" id="1728" />
+<TGConnectingPoint num="31" id="1729" />
+<TGConnectingPoint num="32" id="1730" />
+<TGConnectingPoint num="33" id="1731" />
+<TGConnectingPoint num="34" id="1732" />
+<TGConnectingPoint num="35" id="1733" />
+<TGConnectingPoint num="36" id="1734" />
+<TGConnectingPoint num="37" id="1735" />
+<TGConnectingPoint num="38" id="1736" />
+<TGConnectingPoint num="39" id="1737" />
+<TGConnectingPoint num="40" id="1738" />
+<TGConnectingPoint num="41" id="1739" />
+<TGConnectingPoint num="42" id="1740" />
+<TGConnectingPoint num="43" id="1741" />
+<TGConnectingPoint num="44" id="1742" />
+<TGConnectingPoint num="45" id="1743" />
+<TGConnectingPoint num="46" id="1744" />
+<TGConnectingPoint num="47" id="1745" />
+<TGConnectingPoint num="48" id="1746" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1800" >
+<COMPONENT type="606" id="1797" >
 <cdparam x="473" y="86" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Network" value="Network" />
-<TGConnectingPoint num="0" id="1751" />
-<TGConnectingPoint num="1" id="1752" />
-<TGConnectingPoint num="2" id="1753" />
-<TGConnectingPoint num="3" id="1754" />
-<TGConnectingPoint num="4" id="1755" />
-<TGConnectingPoint num="5" id="1756" />
-<TGConnectingPoint num="6" id="1757" />
-<TGConnectingPoint num="7" id="1758" />
-<TGConnectingPoint num="8" id="1759" />
-<TGConnectingPoint num="9" id="1760" />
-<TGConnectingPoint num="10" id="1761" />
-<TGConnectingPoint num="11" id="1762" />
-<TGConnectingPoint num="12" id="1763" />
-<TGConnectingPoint num="13" id="1764" />
-<TGConnectingPoint num="14" id="1765" />
-<TGConnectingPoint num="15" id="1766" />
-<TGConnectingPoint num="16" id="1767" />
-<TGConnectingPoint num="17" id="1768" />
-<TGConnectingPoint num="18" id="1769" />
-<TGConnectingPoint num="19" id="1770" />
-<TGConnectingPoint num="20" id="1771" />
-<TGConnectingPoint num="21" id="1772" />
-<TGConnectingPoint num="22" id="1773" />
-<TGConnectingPoint num="23" id="1774" />
-<TGConnectingPoint num="24" id="1775" />
-<TGConnectingPoint num="25" id="1776" />
-<TGConnectingPoint num="26" id="1777" />
-<TGConnectingPoint num="27" id="1778" />
-<TGConnectingPoint num="28" id="1779" />
-<TGConnectingPoint num="29" id="1780" />
-<TGConnectingPoint num="30" id="1781" />
-<TGConnectingPoint num="31" id="1782" />
-<TGConnectingPoint num="32" id="1783" />
-<TGConnectingPoint num="33" id="1784" />
-<TGConnectingPoint num="34" id="1785" />
-<TGConnectingPoint num="35" id="1786" />
-<TGConnectingPoint num="36" id="1787" />
-<TGConnectingPoint num="37" id="1788" />
-<TGConnectingPoint num="38" id="1789" />
-<TGConnectingPoint num="39" id="1790" />
-<TGConnectingPoint num="40" id="1791" />
-<TGConnectingPoint num="41" id="1792" />
-<TGConnectingPoint num="42" id="1793" />
-<TGConnectingPoint num="43" id="1794" />
-<TGConnectingPoint num="44" id="1795" />
-<TGConnectingPoint num="45" id="1796" />
-<TGConnectingPoint num="46" id="1797" />
-<TGConnectingPoint num="47" id="1798" />
-<TGConnectingPoint num="48" id="1799" />
+<TGConnectingPoint num="0" id="1748" />
+<TGConnectingPoint num="1" id="1749" />
+<TGConnectingPoint num="2" id="1750" />
+<TGConnectingPoint num="3" id="1751" />
+<TGConnectingPoint num="4" id="1752" />
+<TGConnectingPoint num="5" id="1753" />
+<TGConnectingPoint num="6" id="1754" />
+<TGConnectingPoint num="7" id="1755" />
+<TGConnectingPoint num="8" id="1756" />
+<TGConnectingPoint num="9" id="1757" />
+<TGConnectingPoint num="10" id="1758" />
+<TGConnectingPoint num="11" id="1759" />
+<TGConnectingPoint num="12" id="1760" />
+<TGConnectingPoint num="13" id="1761" />
+<TGConnectingPoint num="14" id="1762" />
+<TGConnectingPoint num="15" id="1763" />
+<TGConnectingPoint num="16" id="1764" />
+<TGConnectingPoint num="17" id="1765" />
+<TGConnectingPoint num="18" id="1766" />
+<TGConnectingPoint num="19" id="1767" />
+<TGConnectingPoint num="20" id="1768" />
+<TGConnectingPoint num="21" id="1769" />
+<TGConnectingPoint num="22" id="1770" />
+<TGConnectingPoint num="23" id="1771" />
+<TGConnectingPoint num="24" id="1772" />
+<TGConnectingPoint num="25" id="1773" />
+<TGConnectingPoint num="26" id="1774" />
+<TGConnectingPoint num="27" id="1775" />
+<TGConnectingPoint num="28" id="1776" />
+<TGConnectingPoint num="29" id="1777" />
+<TGConnectingPoint num="30" id="1778" />
+<TGConnectingPoint num="31" id="1779" />
+<TGConnectingPoint num="32" id="1780" />
+<TGConnectingPoint num="33" id="1781" />
+<TGConnectingPoint num="34" id="1782" />
+<TGConnectingPoint num="35" id="1783" />
+<TGConnectingPoint num="36" id="1784" />
+<TGConnectingPoint num="37" id="1785" />
+<TGConnectingPoint num="38" id="1786" />
+<TGConnectingPoint num="39" id="1787" />
+<TGConnectingPoint num="40" id="1788" />
+<TGConnectingPoint num="41" id="1789" />
+<TGConnectingPoint num="42" id="1790" />
+<TGConnectingPoint num="43" id="1791" />
+<TGConnectingPoint num="44" id="1792" />
+<TGConnectingPoint num="45" id="1793" />
+<TGConnectingPoint num="46" id="1794" />
+<TGConnectingPoint num="47" id="1795" />
+<TGConnectingPoint num="48" id="1796" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1868" >
+<COMPONENT type="606" id="1865" >
 <cdparam x="201" y="86" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="283" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="OnboardCommunication" value="OnboardCommunication" />
-<TGConnectingPoint num="0" id="1819" />
-<TGConnectingPoint num="1" id="1820" />
-<TGConnectingPoint num="2" id="1821" />
-<TGConnectingPoint num="3" id="1822" />
-<TGConnectingPoint num="4" id="1823" />
-<TGConnectingPoint num="5" id="1824" />
-<TGConnectingPoint num="6" id="1825" />
-<TGConnectingPoint num="7" id="1826" />
-<TGConnectingPoint num="8" id="1827" />
-<TGConnectingPoint num="9" id="1828" />
-<TGConnectingPoint num="10" id="1829" />
-<TGConnectingPoint num="11" id="1830" />
-<TGConnectingPoint num="12" id="1831" />
-<TGConnectingPoint num="13" id="1832" />
-<TGConnectingPoint num="14" id="1833" />
-<TGConnectingPoint num="15" id="1834" />
-<TGConnectingPoint num="16" id="1835" />
-<TGConnectingPoint num="17" id="1836" />
-<TGConnectingPoint num="18" id="1837" />
-<TGConnectingPoint num="19" id="1838" />
-<TGConnectingPoint num="20" id="1839" />
-<TGConnectingPoint num="21" id="1840" />
-<TGConnectingPoint num="22" id="1841" />
-<TGConnectingPoint num="23" id="1842" />
-<TGConnectingPoint num="24" id="1843" />
-<TGConnectingPoint num="25" id="1844" />
-<TGConnectingPoint num="26" id="1845" />
-<TGConnectingPoint num="27" id="1846" />
-<TGConnectingPoint num="28" id="1847" />
-<TGConnectingPoint num="29" id="1848" />
-<TGConnectingPoint num="30" id="1849" />
-<TGConnectingPoint num="31" id="1850" />
-<TGConnectingPoint num="32" id="1851" />
-<TGConnectingPoint num="33" id="1852" />
-<TGConnectingPoint num="34" id="1853" />
-<TGConnectingPoint num="35" id="1854" />
-<TGConnectingPoint num="36" id="1855" />
-<TGConnectingPoint num="37" id="1856" />
-<TGConnectingPoint num="38" id="1857" />
-<TGConnectingPoint num="39" id="1858" />
-<TGConnectingPoint num="40" id="1859" />
-<TGConnectingPoint num="41" id="1860" />
-<TGConnectingPoint num="42" id="1861" />
-<TGConnectingPoint num="43" id="1862" />
-<TGConnectingPoint num="44" id="1863" />
-<TGConnectingPoint num="45" id="1864" />
-<TGConnectingPoint num="46" id="1865" />
-<TGConnectingPoint num="47" id="1866" />
-<TGConnectingPoint num="48" id="1867" />
+<TGConnectingPoint num="0" id="1816" />
+<TGConnectingPoint num="1" id="1817" />
+<TGConnectingPoint num="2" id="1818" />
+<TGConnectingPoint num="3" id="1819" />
+<TGConnectingPoint num="4" id="1820" />
+<TGConnectingPoint num="5" id="1821" />
+<TGConnectingPoint num="6" id="1822" />
+<TGConnectingPoint num="7" id="1823" />
+<TGConnectingPoint num="8" id="1824" />
+<TGConnectingPoint num="9" id="1825" />
+<TGConnectingPoint num="10" id="1826" />
+<TGConnectingPoint num="11" id="1827" />
+<TGConnectingPoint num="12" id="1828" />
+<TGConnectingPoint num="13" id="1829" />
+<TGConnectingPoint num="14" id="1830" />
+<TGConnectingPoint num="15" id="1831" />
+<TGConnectingPoint num="16" id="1832" />
+<TGConnectingPoint num="17" id="1833" />
+<TGConnectingPoint num="18" id="1834" />
+<TGConnectingPoint num="19" id="1835" />
+<TGConnectingPoint num="20" id="1836" />
+<TGConnectingPoint num="21" id="1837" />
+<TGConnectingPoint num="22" id="1838" />
+<TGConnectingPoint num="23" id="1839" />
+<TGConnectingPoint num="24" id="1840" />
+<TGConnectingPoint num="25" id="1841" />
+<TGConnectingPoint num="26" id="1842" />
+<TGConnectingPoint num="27" id="1843" />
+<TGConnectingPoint num="28" id="1844" />
+<TGConnectingPoint num="29" id="1845" />
+<TGConnectingPoint num="30" id="1846" />
+<TGConnectingPoint num="31" id="1847" />
+<TGConnectingPoint num="32" id="1848" />
+<TGConnectingPoint num="33" id="1849" />
+<TGConnectingPoint num="34" id="1850" />
+<TGConnectingPoint num="35" id="1851" />
+<TGConnectingPoint num="36" id="1852" />
+<TGConnectingPoint num="37" id="1853" />
+<TGConnectingPoint num="38" id="1854" />
+<TGConnectingPoint num="39" id="1855" />
+<TGConnectingPoint num="40" id="1856" />
+<TGConnectingPoint num="41" id="1857" />
+<TGConnectingPoint num="42" id="1858" />
+<TGConnectingPoint num="43" id="1859" />
+<TGConnectingPoint num="44" id="1860" />
+<TGConnectingPoint num="45" id="1861" />
+<TGConnectingPoint num="46" id="1862" />
+<TGConnectingPoint num="47" id="1863" />
+<TGConnectingPoint num="48" id="1864" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="603" id="1809" >
-<father id="1868" num="0" />
-<cdparam x="219" y="344" />
+<SUBCOMPONENT type="604" id="1806" >
+<father id="1865" num="0" />
+<cdparam x="219" y="448" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
-<TGConnectingPoint num="0" id="1801" />
-<TGConnectingPoint num="1" id="1802" />
-<TGConnectingPoint num="2" id="1803" />
-<TGConnectingPoint num="3" id="1804" />
-<TGConnectingPoint num="4" id="1805" />
-<TGConnectingPoint num="5" id="1806" />
-<TGConnectingPoint num="6" id="1807" />
-<TGConnectingPoint num="7" id="1808" />
+<infoparam name="timer cancellation" value="{timer=ATST1}" />
+<TGConnectingPoint num="0" id="1798" />
+<TGConnectingPoint num="1" id="1799" />
+<TGConnectingPoint num="2" id="1800" />
+<TGConnectingPoint num="3" id="1801" />
+<TGConnectingPoint num="4" id="1802" />
+<TGConnectingPoint num="5" id="1803" />
+<TGConnectingPoint num="6" id="1804" />
+<TGConnectingPoint num="7" id="1805" />
 <extraparam>
-<Interval timer="ATST1" duration="10" />
+<Interval timer="ATST1" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="604" id="1818" >
-<father id="1868" num="1" />
-<cdparam x="219" y="448" />
+<SUBCOMPONENT type="603" id="1815" >
+<father id="1865" num="1" />
+<cdparam x="219" y="344" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer cancellation" value="{timer=ATST1}" />
-<TGConnectingPoint num="0" id="1810" />
-<TGConnectingPoint num="1" id="1811" />
-<TGConnectingPoint num="2" id="1812" />
-<TGConnectingPoint num="3" id="1813" />
-<TGConnectingPoint num="4" id="1814" />
-<TGConnectingPoint num="5" id="1815" />
-<TGConnectingPoint num="6" id="1816" />
-<TGConnectingPoint num="7" id="1817" />
+<infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
+<TGConnectingPoint num="0" id="1807" />
+<TGConnectingPoint num="1" id="1808" />
+<TGConnectingPoint num="2" id="1809" />
+<TGConnectingPoint num="3" id="1810" />
+<TGConnectingPoint num="4" id="1811" />
+<TGConnectingPoint num="5" id="1812" />
+<TGConnectingPoint num="6" id="1813" />
+<TGConnectingPoint num="7" id="1814" />
 <extraparam>
-<Interval timer="ATST1" />
+<Interval timer="ATST1" duration="10" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="606" id="1918" >
+<COMPONENT type="606" id="1915" >
 <cdparam x="799" y="86" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="310" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Controller" value="AirTrafficController" />
-<TGConnectingPoint num="0" id="1869" />
-<TGConnectingPoint num="1" id="1870" />
-<TGConnectingPoint num="2" id="1871" />
-<TGConnectingPoint num="3" id="1872" />
-<TGConnectingPoint num="4" id="1873" />
-<TGConnectingPoint num="5" id="1874" />
-<TGConnectingPoint num="6" id="1875" />
-<TGConnectingPoint num="7" id="1876" />
-<TGConnectingPoint num="8" id="1877" />
-<TGConnectingPoint num="9" id="1878" />
-<TGConnectingPoint num="10" id="1879" />
-<TGConnectingPoint num="11" id="1880" />
-<TGConnectingPoint num="12" id="1881" />
-<TGConnectingPoint num="13" id="1882" />
-<TGConnectingPoint num="14" id="1883" />
-<TGConnectingPoint num="15" id="1884" />
-<TGConnectingPoint num="16" id="1885" />
-<TGConnectingPoint num="17" id="1886" />
-<TGConnectingPoint num="18" id="1887" />
-<TGConnectingPoint num="19" id="1888" />
-<TGConnectingPoint num="20" id="1889" />
-<TGConnectingPoint num="21" id="1890" />
-<TGConnectingPoint num="22" id="1891" />
-<TGConnectingPoint num="23" id="1892" />
-<TGConnectingPoint num="24" id="1893" />
-<TGConnectingPoint num="25" id="1894" />
-<TGConnectingPoint num="26" id="1895" />
-<TGConnectingPoint num="27" id="1896" />
-<TGConnectingPoint num="28" id="1897" />
-<TGConnectingPoint num="29" id="1898" />
-<TGConnectingPoint num="30" id="1899" />
-<TGConnectingPoint num="31" id="1900" />
-<TGConnectingPoint num="32" id="1901" />
-<TGConnectingPoint num="33" id="1902" />
-<TGConnectingPoint num="34" id="1903" />
-<TGConnectingPoint num="35" id="1904" />
-<TGConnectingPoint num="36" id="1905" />
-<TGConnectingPoint num="37" id="1906" />
-<TGConnectingPoint num="38" id="1907" />
-<TGConnectingPoint num="39" id="1908" />
-<TGConnectingPoint num="40" id="1909" />
-<TGConnectingPoint num="41" id="1910" />
-<TGConnectingPoint num="42" id="1911" />
-<TGConnectingPoint num="43" id="1912" />
-<TGConnectingPoint num="44" id="1913" />
-<TGConnectingPoint num="45" id="1914" />
-<TGConnectingPoint num="46" id="1915" />
-<TGConnectingPoint num="47" id="1916" />
-<TGConnectingPoint num="48" id="1917" />
+<TGConnectingPoint num="0" id="1866" />
+<TGConnectingPoint num="1" id="1867" />
+<TGConnectingPoint num="2" id="1868" />
+<TGConnectingPoint num="3" id="1869" />
+<TGConnectingPoint num="4" id="1870" />
+<TGConnectingPoint num="5" id="1871" />
+<TGConnectingPoint num="6" id="1872" />
+<TGConnectingPoint num="7" id="1873" />
+<TGConnectingPoint num="8" id="1874" />
+<TGConnectingPoint num="9" id="1875" />
+<TGConnectingPoint num="10" id="1876" />
+<TGConnectingPoint num="11" id="1877" />
+<TGConnectingPoint num="12" id="1878" />
+<TGConnectingPoint num="13" id="1879" />
+<TGConnectingPoint num="14" id="1880" />
+<TGConnectingPoint num="15" id="1881" />
+<TGConnectingPoint num="16" id="1882" />
+<TGConnectingPoint num="17" id="1883" />
+<TGConnectingPoint num="18" id="1884" />
+<TGConnectingPoint num="19" id="1885" />
+<TGConnectingPoint num="20" id="1886" />
+<TGConnectingPoint num="21" id="1887" />
+<TGConnectingPoint num="22" id="1888" />
+<TGConnectingPoint num="23" id="1889" />
+<TGConnectingPoint num="24" id="1890" />
+<TGConnectingPoint num="25" id="1891" />
+<TGConnectingPoint num="26" id="1892" />
+<TGConnectingPoint num="27" id="1893" />
+<TGConnectingPoint num="28" id="1894" />
+<TGConnectingPoint num="29" id="1895" />
+<TGConnectingPoint num="30" id="1896" />
+<TGConnectingPoint num="31" id="1897" />
+<TGConnectingPoint num="32" id="1898" />
+<TGConnectingPoint num="33" id="1899" />
+<TGConnectingPoint num="34" id="1900" />
+<TGConnectingPoint num="35" id="1901" />
+<TGConnectingPoint num="36" id="1902" />
+<TGConnectingPoint num="37" id="1903" />
+<TGConnectingPoint num="38" id="1904" />
+<TGConnectingPoint num="39" id="1905" />
+<TGConnectingPoint num="40" id="1906" />
+<TGConnectingPoint num="41" id="1907" />
+<TGConnectingPoint num="42" id="1908" />
+<TGConnectingPoint num="43" id="1909" />
+<TGConnectingPoint num="44" id="1910" />
+<TGConnectingPoint num="45" id="1911" />
+<TGConnectingPoint num="46" id="1912" />
+<TGConnectingPoint num="47" id="1913" />
+<TGConnectingPoint num="48" id="1914" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="1968" >
+<COMPONENT type="606" id="1965" >
 <cdparam x="38" y="86" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Pilot" value="Pilot" />
-<TGConnectingPoint num="0" id="1919" />
-<TGConnectingPoint num="1" id="1920" />
-<TGConnectingPoint num="2" id="1921" />
-<TGConnectingPoint num="3" id="1922" />
-<TGConnectingPoint num="4" id="1923" />
-<TGConnectingPoint num="5" id="1924" />
-<TGConnectingPoint num="6" id="1925" />
-<TGConnectingPoint num="7" id="1926" />
-<TGConnectingPoint num="8" id="1927" />
-<TGConnectingPoint num="9" id="1928" />
-<TGConnectingPoint num="10" id="1929" />
-<TGConnectingPoint num="11" id="1930" />
-<TGConnectingPoint num="12" id="1931" />
-<TGConnectingPoint num="13" id="1932" />
-<TGConnectingPoint num="14" id="1933" />
-<TGConnectingPoint num="15" id="1934" />
-<TGConnectingPoint num="16" id="1935" />
-<TGConnectingPoint num="17" id="1936" />
-<TGConnectingPoint num="18" id="1937" />
-<TGConnectingPoint num="19" id="1938" />
-<TGConnectingPoint num="20" id="1939" />
-<TGConnectingPoint num="21" id="1940" />
-<TGConnectingPoint num="22" id="1941" />
-<TGConnectingPoint num="23" id="1942" />
-<TGConnectingPoint num="24" id="1943" />
-<TGConnectingPoint num="25" id="1944" />
-<TGConnectingPoint num="26" id="1945" />
-<TGConnectingPoint num="27" id="1946" />
-<TGConnectingPoint num="28" id="1947" />
-<TGConnectingPoint num="29" id="1948" />
-<TGConnectingPoint num="30" id="1949" />
-<TGConnectingPoint num="31" id="1950" />
-<TGConnectingPoint num="32" id="1951" />
-<TGConnectingPoint num="33" id="1952" />
-<TGConnectingPoint num="34" id="1953" />
-<TGConnectingPoint num="35" id="1954" />
-<TGConnectingPoint num="36" id="1955" />
-<TGConnectingPoint num="37" id="1956" />
-<TGConnectingPoint num="38" id="1957" />
-<TGConnectingPoint num="39" id="1958" />
-<TGConnectingPoint num="40" id="1959" />
-<TGConnectingPoint num="41" id="1960" />
-<TGConnectingPoint num="42" id="1961" />
-<TGConnectingPoint num="43" id="1962" />
-<TGConnectingPoint num="44" id="1963" />
-<TGConnectingPoint num="45" id="1964" />
-<TGConnectingPoint num="46" id="1965" />
-<TGConnectingPoint num="47" id="1966" />
-<TGConnectingPoint num="48" id="1967" />
+<TGConnectingPoint num="0" id="1916" />
+<TGConnectingPoint num="1" id="1917" />
+<TGConnectingPoint num="2" id="1918" />
+<TGConnectingPoint num="3" id="1919" />
+<TGConnectingPoint num="4" id="1920" />
+<TGConnectingPoint num="5" id="1921" />
+<TGConnectingPoint num="6" id="1922" />
+<TGConnectingPoint num="7" id="1923" />
+<TGConnectingPoint num="8" id="1924" />
+<TGConnectingPoint num="9" id="1925" />
+<TGConnectingPoint num="10" id="1926" />
+<TGConnectingPoint num="11" id="1927" />
+<TGConnectingPoint num="12" id="1928" />
+<TGConnectingPoint num="13" id="1929" />
+<TGConnectingPoint num="14" id="1930" />
+<TGConnectingPoint num="15" id="1931" />
+<TGConnectingPoint num="16" id="1932" />
+<TGConnectingPoint num="17" id="1933" />
+<TGConnectingPoint num="18" id="1934" />
+<TGConnectingPoint num="19" id="1935" />
+<TGConnectingPoint num="20" id="1936" />
+<TGConnectingPoint num="21" id="1937" />
+<TGConnectingPoint num="22" id="1938" />
+<TGConnectingPoint num="23" id="1939" />
+<TGConnectingPoint num="24" id="1940" />
+<TGConnectingPoint num="25" id="1941" />
+<TGConnectingPoint num="26" id="1942" />
+<TGConnectingPoint num="27" id="1943" />
+<TGConnectingPoint num="28" id="1944" />
+<TGConnectingPoint num="29" id="1945" />
+<TGConnectingPoint num="30" id="1946" />
+<TGConnectingPoint num="31" id="1947" />
+<TGConnectingPoint num="32" id="1948" />
+<TGConnectingPoint num="33" id="1949" />
+<TGConnectingPoint num="34" id="1950" />
+<TGConnectingPoint num="35" id="1951" />
+<TGConnectingPoint num="36" id="1952" />
+<TGConnectingPoint num="37" id="1953" />
+<TGConnectingPoint num="38" id="1954" />
+<TGConnectingPoint num="39" id="1955" />
+<TGConnectingPoint num="40" id="1956" />
+<TGConnectingPoint num="41" id="1957" />
+<TGConnectingPoint num="42" id="1958" />
+<TGConnectingPoint num="43" id="1959" />
+<TGConnectingPoint num="44" id="1960" />
+<TGConnectingPoint num="45" id="1961" />
+<TGConnectingPoint num="46" id="1962" />
+<TGConnectingPoint num="47" id="1963" />
+<TGConnectingPoint num="48" id="1964" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1985" >
+<COMPONENT type="301" id="1982" >
 <cdparam x="390" y="245" />
 <sizeparam width="73" height="39" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3339,22 +3339,22 @@ or timer ATST1 expires, an error indication is given to the the flight crew.
 CC is lost
    
 " />
-<TGConnectingPoint num="0" id="1969" />
-<TGConnectingPoint num="1" id="1970" />
-<TGConnectingPoint num="2" id="1971" />
-<TGConnectingPoint num="3" id="1972" />
-<TGConnectingPoint num="4" id="1973" />
-<TGConnectingPoint num="5" id="1974" />
-<TGConnectingPoint num="6" id="1975" />
-<TGConnectingPoint num="7" id="1976" />
-<TGConnectingPoint num="8" id="1977" />
-<TGConnectingPoint num="9" id="1978" />
-<TGConnectingPoint num="10" id="1979" />
-<TGConnectingPoint num="11" id="1980" />
-<TGConnectingPoint num="12" id="1981" />
-<TGConnectingPoint num="13" id="1982" />
-<TGConnectingPoint num="14" id="1983" />
-<TGConnectingPoint num="15" id="1984" />
+<TGConnectingPoint num="0" id="1966" />
+<TGConnectingPoint num="1" id="1967" />
+<TGConnectingPoint num="2" id="1968" />
+<TGConnectingPoint num="3" id="1969" />
+<TGConnectingPoint num="4" id="1970" />
+<TGConnectingPoint num="5" id="1971" />
+<TGConnectingPoint num="6" id="1972" />
+<TGConnectingPoint num="7" id="1973" />
+<TGConnectingPoint num="8" id="1974" />
+<TGConnectingPoint num="9" id="1975" />
+<TGConnectingPoint num="10" id="1976" />
+<TGConnectingPoint num="11" id="1977" />
+<TGConnectingPoint num="12" id="1978" />
+<TGConnectingPoint num="13" id="1979" />
+<TGConnectingPoint num="14" id="1980" />
+<TGConnectingPoint num="15" id="1981" />
 <extraparam>
 <Line value="    " />
 <Line value="CC is lost" />
@@ -3362,635 +3362,635 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="107" id="1986" >
+<CONNECTOR type="107" id="1983" >
 <cdparam x="625" y="366" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconind" />
-<P1  x="625" y="366" id="1728" />
-<P2  x="804" y="366" id="1896" />
+<P1  x="625" y="366" id="1725" />
+<P2  x="804" y="366" id="1893" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1987" >
+<CONNECTOR type="107" id="1984" >
 <cdparam x="206" y="456" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconconf" />
-<P1  x="206" y="486" id="1858" />
-<P2  x="43" y="486" id="1958" />
+<P1  x="206" y="486" id="1855" />
+<P2  x="43" y="486" id="1955" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1988" >
+<CONNECTOR type="106" id="1985" >
 <cdparam x="478" y="436" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="478" y="436" id="1785" />
-<P2  x="206" y="436" id="1853" />
+<P1  x="478" y="436" id="1782" />
+<P2  x="206" y="436" id="1850" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1989" >
+<CONNECTOR type="106" id="1986" >
 <cdparam x="625" y="416" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="625" y="416" id="1733" />
-<P2  x="478" y="416" id="1783" />
+<P1  x="625" y="416" id="1730" />
+<P2  x="478" y="416" id="1780" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1990" >
+<CONNECTOR type="107" id="1987" >
 <cdparam x="804" y="396" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconresp" />
-<P1  x="804" y="396" id="1899" />
-<P2  x="625" y="396" id="1731" />
+<P1  x="804" y="396" id="1896" />
+<P2  x="625" y="396" id="1728" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1991" >
+<CONNECTOR type="106" id="1988" >
 <cdparam x="466" y="346" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="478" y="346" id="1776" />
-<P2  x="625" y="346" id="1726" />
+<P1  x="478" y="346" id="1773" />
+<P2  x="625" y="346" id="1723" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1992" >
+<CONNECTOR type="106" id="1989" >
 <cdparam x="206" y="326" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="206" y="326" id="1842" />
-<P2  x="478" y="326" id="1774" />
+<P1  x="206" y="326" id="1839" />
+<P2  x="478" y="326" id="1771" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1993" >
+<CONNECTOR type="106" id="1990" >
 <cdparam x="625" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="625" y="226" id="1714" />
-<P2  x="478" y="226" id="1764" />
+<P1  x="625" y="226" id="1711" />
+<P2  x="478" y="226" id="1761" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1994" >
+<CONNECTOR type="106" id="1991" >
 <cdparam x="466" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="478" y="156" id="1757" />
-<P2  x="625" y="156" id="1707" />
+<P1  x="478" y="156" id="1754" />
+<P2  x="625" y="156" id="1704" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="1995" >
+<CONNECTOR type="106" id="1992" >
 <cdparam x="206" y="136" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="206" y="136" id="1823" />
-<P2  x="478" y="136" id="1755" />
+<P1  x="206" y="136" id="1820" />
+<P2  x="478" y="136" id="1752" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1996" >
+<CONNECTOR type="107" id="1993" >
 <cdparam x="15" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconreq" />
-<P1  x="43" y="116" id="1921" />
-<P2  x="206" y="116" id="1821" />
+<P1  x="43" y="116" id="1918" />
+<P2  x="206" y="116" id="1818" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1997" >
+<CONNECTOR type="107" id="1994" >
 <cdparam x="803" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconresp" />
-<P1  x="804" y="206" id="1880" />
-<P2  x="625" y="206" id="1712" />
+<P1  x="804" y="206" id="1877" />
+<P2  x="625" y="206" id="1709" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="1998" >
+<CONNECTOR type="107" id="1995" >
 <cdparam x="625" y="177" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconind" />
-<P1  x="625" y="176" id="1709" />
-<P2  x="804" y="176" id="1877" />
+<P1  x="625" y="176" id="1706" />
+<P2  x="804" y="176" id="1874" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </SequenceDiagramPanel>
 
 <SequenceDiagramPanel name="unsuccesful_retransmissions" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="605" id="2007" >
+<COMPONENT type="605" id="2004" >
 <cdparam x="217" y="690" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="timer expiration" value="{timer=ATST1}" />
-<TGConnectingPoint num="0" id="1999" />
-<TGConnectingPoint num="1" id="2000" />
-<TGConnectingPoint num="2" id="2001" />
-<TGConnectingPoint num="3" id="2002" />
-<TGConnectingPoint num="4" id="2003" />
-<TGConnectingPoint num="5" id="2004" />
-<TGConnectingPoint num="6" id="2005" />
-<TGConnectingPoint num="7" id="2006" />
+<TGConnectingPoint num="0" id="1996" />
+<TGConnectingPoint num="1" id="1997" />
+<TGConnectingPoint num="2" id="1998" />
+<TGConnectingPoint num="3" id="1999" />
+<TGConnectingPoint num="4" id="2000" />
+<TGConnectingPoint num="5" id="2001" />
+<TGConnectingPoint num="6" id="2002" />
+<TGConnectingPoint num="7" id="2003" />
 <extraparam>
 <Interval timer="ATST1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="605" id="2016" >
+<COMPONENT type="605" id="2013" >
 <cdparam x="214" y="264" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="timer expiration" value="{timer=ATST1}" />
-<TGConnectingPoint num="0" id="2008" />
-<TGConnectingPoint num="1" id="2009" />
-<TGConnectingPoint num="2" id="2010" />
-<TGConnectingPoint num="3" id="2011" />
-<TGConnectingPoint num="4" id="2012" />
-<TGConnectingPoint num="5" id="2013" />
-<TGConnectingPoint num="6" id="2014" />
-<TGConnectingPoint num="7" id="2015" />
+<TGConnectingPoint num="0" id="2005" />
+<TGConnectingPoint num="1" id="2006" />
+<TGConnectingPoint num="2" id="2007" />
+<TGConnectingPoint num="3" id="2008" />
+<TGConnectingPoint num="4" id="2009" />
+<TGConnectingPoint num="5" id="2010" />
+<TGConnectingPoint num="6" id="2011" />
+<TGConnectingPoint num="7" id="2012" />
 <extraparam>
 <Interval timer="ATST1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="603" id="2025" >
+<COMPONENT type="603" id="2022" >
 <cdparam x="216" y="141" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
-<TGConnectingPoint num="0" id="2017" />
-<TGConnectingPoint num="1" id="2018" />
-<TGConnectingPoint num="2" id="2019" />
-<TGConnectingPoint num="3" id="2020" />
-<TGConnectingPoint num="4" id="2021" />
-<TGConnectingPoint num="5" id="2022" />
-<TGConnectingPoint num="6" id="2023" />
-<TGConnectingPoint num="7" id="2024" />
+<TGConnectingPoint num="0" id="2014" />
+<TGConnectingPoint num="1" id="2015" />
+<TGConnectingPoint num="2" id="2016" />
+<TGConnectingPoint num="3" id="2017" />
+<TGConnectingPoint num="4" id="2018" />
+<TGConnectingPoint num="5" id="2019" />
+<TGConnectingPoint num="6" id="2020" />
+<TGConnectingPoint num="7" id="2021" />
 <extraparam>
 <Interval timer="ATST1" duration="10" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="2100" >
+<COMPONENT type="606" id="2097" >
 <cdparam x="615" y="76" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="330" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="GroundCommunication" value="GroundCommunication" />
-<TGConnectingPoint num="0" id="2026" />
-<TGConnectingPoint num="1" id="2027" />
-<TGConnectingPoint num="2" id="2028" />
-<TGConnectingPoint num="3" id="2029" />
-<TGConnectingPoint num="4" id="2030" />
-<TGConnectingPoint num="5" id="2031" />
-<TGConnectingPoint num="6" id="2032" />
-<TGConnectingPoint num="7" id="2033" />
-<TGConnectingPoint num="8" id="2034" />
-<TGConnectingPoint num="9" id="2035" />
-<TGConnectingPoint num="10" id="2036" />
-<TGConnectingPoint num="11" id="2037" />
-<TGConnectingPoint num="12" id="2038" />
-<TGConnectingPoint num="13" id="2039" />
-<TGConnectingPoint num="14" id="2040" />
-<TGConnectingPoint num="15" id="2041" />
-<TGConnectingPoint num="16" id="2042" />
-<TGConnectingPoint num="17" id="2043" />
-<TGConnectingPoint num="18" id="2044" />
-<TGConnectingPoint num="19" id="2045" />
-<TGConnectingPoint num="20" id="2046" />
-<TGConnectingPoint num="21" id="2047" />
-<TGConnectingPoint num="22" id="2048" />
-<TGConnectingPoint num="23" id="2049" />
-<TGConnectingPoint num="24" id="2050" />
-<TGConnectingPoint num="25" id="2051" />
-<TGConnectingPoint num="26" id="2052" />
-<TGConnectingPoint num="27" id="2053" />
-<TGConnectingPoint num="28" id="2054" />
-<TGConnectingPoint num="29" id="2055" />
-<TGConnectingPoint num="30" id="2056" />
-<TGConnectingPoint num="31" id="2057" />
-<TGConnectingPoint num="32" id="2058" />
-<TGConnectingPoint num="33" id="2059" />
-<TGConnectingPoint num="34" id="2060" />
-<TGConnectingPoint num="35" id="2061" />
-<TGConnectingPoint num="36" id="2062" />
-<TGConnectingPoint num="37" id="2063" />
-<TGConnectingPoint num="38" id="2064" />
-<TGConnectingPoint num="39" id="2065" />
-<TGConnectingPoint num="40" id="2066" />
-<TGConnectingPoint num="41" id="2067" />
-<TGConnectingPoint num="42" id="2068" />
-<TGConnectingPoint num="43" id="2069" />
-<TGConnectingPoint num="44" id="2070" />
-<TGConnectingPoint num="45" id="2071" />
-<TGConnectingPoint num="46" id="2072" />
-<TGConnectingPoint num="47" id="2073" />
-<TGConnectingPoint num="48" id="2074" />
-<TGConnectingPoint num="49" id="2075" />
-<TGConnectingPoint num="50" id="2076" />
-<TGConnectingPoint num="51" id="2077" />
-<TGConnectingPoint num="52" id="2078" />
-<TGConnectingPoint num="53" id="2079" />
-<TGConnectingPoint num="54" id="2080" />
-<TGConnectingPoint num="55" id="2081" />
-<TGConnectingPoint num="56" id="2082" />
-<TGConnectingPoint num="57" id="2083" />
-<TGConnectingPoint num="58" id="2084" />
-<TGConnectingPoint num="59" id="2085" />
-<TGConnectingPoint num="60" id="2086" />
-<TGConnectingPoint num="61" id="2087" />
-<TGConnectingPoint num="62" id="2088" />
-<TGConnectingPoint num="63" id="2089" />
-<TGConnectingPoint num="64" id="2090" />
-<TGConnectingPoint num="65" id="2091" />
-<TGConnectingPoint num="66" id="2092" />
-<TGConnectingPoint num="67" id="2093" />
-<TGConnectingPoint num="68" id="2094" />
-<TGConnectingPoint num="69" id="2095" />
-<TGConnectingPoint num="70" id="2096" />
-<TGConnectingPoint num="71" id="2097" />
-<TGConnectingPoint num="72" id="2098" />
-<TGConnectingPoint num="73" id="2099" />
+<TGConnectingPoint num="0" id="2023" />
+<TGConnectingPoint num="1" id="2024" />
+<TGConnectingPoint num="2" id="2025" />
+<TGConnectingPoint num="3" id="2026" />
+<TGConnectingPoint num="4" id="2027" />
+<TGConnectingPoint num="5" id="2028" />
+<TGConnectingPoint num="6" id="2029" />
+<TGConnectingPoint num="7" id="2030" />
+<TGConnectingPoint num="8" id="2031" />
+<TGConnectingPoint num="9" id="2032" />
+<TGConnectingPoint num="10" id="2033" />
+<TGConnectingPoint num="11" id="2034" />
+<TGConnectingPoint num="12" id="2035" />
+<TGConnectingPoint num="13" id="2036" />
+<TGConnectingPoint num="14" id="2037" />
+<TGConnectingPoint num="15" id="2038" />
+<TGConnectingPoint num="16" id="2039" />
+<TGConnectingPoint num="17" id="2040" />
+<TGConnectingPoint num="18" id="2041" />
+<TGConnectingPoint num="19" id="2042" />
+<TGConnectingPoint num="20" id="2043" />
+<TGConnectingPoint num="21" id="2044" />
+<TGConnectingPoint num="22" id="2045" />
+<TGConnectingPoint num="23" id="2046" />
+<TGConnectingPoint num="24" id="2047" />
+<TGConnectingPoint num="25" id="2048" />
+<TGConnectingPoint num="26" id="2049" />
+<TGConnectingPoint num="27" id="2050" />
+<TGConnectingPoint num="28" id="2051" />
+<TGConnectingPoint num="29" id="2052" />
+<TGConnectingPoint num="30" id="2053" />
+<TGConnectingPoint num="31" id="2054" />
+<TGConnectingPoint num="32" id="2055" />
+<TGConnectingPoint num="33" id="2056" />
+<TGConnectingPoint num="34" id="2057" />
+<TGConnectingPoint num="35" id="2058" />
+<TGConnectingPoint num="36" id="2059" />
+<TGConnectingPoint num="37" id="2060" />
+<TGConnectingPoint num="38" id="2061" />
+<TGConnectingPoint num="39" id="2062" />
+<TGConnectingPoint num="40" id="2063" />
+<TGConnectingPoint num="41" id="2064" />
+<TGConnectingPoint num="42" id="2065" />
+<TGConnectingPoint num="43" id="2066" />
+<TGConnectingPoint num="44" id="2067" />
+<TGConnectingPoint num="45" id="2068" />
+<TGConnectingPoint num="46" id="2069" />
+<TGConnectingPoint num="47" id="2070" />
+<TGConnectingPoint num="48" id="2071" />
+<TGConnectingPoint num="49" id="2072" />
+<TGConnectingPoint num="50" id="2073" />
+<TGConnectingPoint num="51" id="2074" />
+<TGConnectingPoint num="52" id="2075" />
+<TGConnectingPoint num="53" id="2076" />
+<TGConnectingPoint num="54" id="2077" />
+<TGConnectingPoint num="55" id="2078" />
+<TGConnectingPoint num="56" id="2079" />
+<TGConnectingPoint num="57" id="2080" />
+<TGConnectingPoint num="58" id="2081" />
+<TGConnectingPoint num="59" id="2082" />
+<TGConnectingPoint num="60" id="2083" />
+<TGConnectingPoint num="61" id="2084" />
+<TGConnectingPoint num="62" id="2085" />
+<TGConnectingPoint num="63" id="2086" />
+<TGConnectingPoint num="64" id="2087" />
+<TGConnectingPoint num="65" id="2088" />
+<TGConnectingPoint num="66" id="2089" />
+<TGConnectingPoint num="67" id="2090" />
+<TGConnectingPoint num="68" id="2091" />
+<TGConnectingPoint num="69" id="2092" />
+<TGConnectingPoint num="70" id="2093" />
+<TGConnectingPoint num="71" id="2094" />
+<TGConnectingPoint num="72" id="2095" />
+<TGConnectingPoint num="73" id="2096" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="2175" >
+<COMPONENT type="606" id="2172" >
 <cdparam x="442" y="76" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Network" value="Network" />
-<TGConnectingPoint num="0" id="2101" />
-<TGConnectingPoint num="1" id="2102" />
-<TGConnectingPoint num="2" id="2103" />
-<TGConnectingPoint num="3" id="2104" />
-<TGConnectingPoint num="4" id="2105" />
-<TGConnectingPoint num="5" id="2106" />
-<TGConnectingPoint num="6" id="2107" />
-<TGConnectingPoint num="7" id="2108" />
-<TGConnectingPoint num="8" id="2109" />
-<TGConnectingPoint num="9" id="2110" />
-<TGConnectingPoint num="10" id="2111" />
-<TGConnectingPoint num="11" id="2112" />
-<TGConnectingPoint num="12" id="2113" />
-<TGConnectingPoint num="13" id="2114" />
-<TGConnectingPoint num="14" id="2115" />
-<TGConnectingPoint num="15" id="2116" />
-<TGConnectingPoint num="16" id="2117" />
-<TGConnectingPoint num="17" id="2118" />
-<TGConnectingPoint num="18" id="2119" />
-<TGConnectingPoint num="19" id="2120" />
-<TGConnectingPoint num="20" id="2121" />
-<TGConnectingPoint num="21" id="2122" />
-<TGConnectingPoint num="22" id="2123" />
-<TGConnectingPoint num="23" id="2124" />
-<TGConnectingPoint num="24" id="2125" />
-<TGConnectingPoint num="25" id="2126" />
-<TGConnectingPoint num="26" id="2127" />
-<TGConnectingPoint num="27" id="2128" />
-<TGConnectingPoint num="28" id="2129" />
-<TGConnectingPoint num="29" id="2130" />
-<TGConnectingPoint num="30" id="2131" />
-<TGConnectingPoint num="31" id="2132" />
-<TGConnectingPoint num="32" id="2133" />
-<TGConnectingPoint num="33" id="2134" />
-<TGConnectingPoint num="34" id="2135" />
-<TGConnectingPoint num="35" id="2136" />
-<TGConnectingPoint num="36" id="2137" />
-<TGConnectingPoint num="37" id="2138" />
-<TGConnectingPoint num="38" id="2139" />
-<TGConnectingPoint num="39" id="2140" />
-<TGConnectingPoint num="40" id="2141" />
-<TGConnectingPoint num="41" id="2142" />
-<TGConnectingPoint num="42" id="2143" />
-<TGConnectingPoint num="43" id="2144" />
-<TGConnectingPoint num="44" id="2145" />
-<TGConnectingPoint num="45" id="2146" />
-<TGConnectingPoint num="46" id="2147" />
-<TGConnectingPoint num="47" id="2148" />
-<TGConnectingPoint num="48" id="2149" />
-<TGConnectingPoint num="49" id="2150" />
-<TGConnectingPoint num="50" id="2151" />
-<TGConnectingPoint num="51" id="2152" />
-<TGConnectingPoint num="52" id="2153" />
-<TGConnectingPoint num="53" id="2154" />
-<TGConnectingPoint num="54" id="2155" />
-<TGConnectingPoint num="55" id="2156" />
-<TGConnectingPoint num="56" id="2157" />
-<TGConnectingPoint num="57" id="2158" />
-<TGConnectingPoint num="58" id="2159" />
-<TGConnectingPoint num="59" id="2160" />
-<TGConnectingPoint num="60" id="2161" />
-<TGConnectingPoint num="61" id="2162" />
-<TGConnectingPoint num="62" id="2163" />
-<TGConnectingPoint num="63" id="2164" />
-<TGConnectingPoint num="64" id="2165" />
-<TGConnectingPoint num="65" id="2166" />
-<TGConnectingPoint num="66" id="2167" />
-<TGConnectingPoint num="67" id="2168" />
-<TGConnectingPoint num="68" id="2169" />
-<TGConnectingPoint num="69" id="2170" />
-<TGConnectingPoint num="70" id="2171" />
-<TGConnectingPoint num="71" id="2172" />
-<TGConnectingPoint num="72" id="2173" />
-<TGConnectingPoint num="73" id="2174" />
+<TGConnectingPoint num="0" id="2098" />
+<TGConnectingPoint num="1" id="2099" />
+<TGConnectingPoint num="2" id="2100" />
+<TGConnectingPoint num="3" id="2101" />
+<TGConnectingPoint num="4" id="2102" />
+<TGConnectingPoint num="5" id="2103" />
+<TGConnectingPoint num="6" id="2104" />
+<TGConnectingPoint num="7" id="2105" />
+<TGConnectingPoint num="8" id="2106" />
+<TGConnectingPoint num="9" id="2107" />
+<TGConnectingPoint num="10" id="2108" />
+<TGConnectingPoint num="11" id="2109" />
+<TGConnectingPoint num="12" id="2110" />
+<TGConnectingPoint num="13" id="2111" />
+<TGConnectingPoint num="14" id="2112" />
+<TGConnectingPoint num="15" id="2113" />
+<TGConnectingPoint num="16" id="2114" />
+<TGConnectingPoint num="17" id="2115" />
+<TGConnectingPoint num="18" id="2116" />
+<TGConnectingPoint num="19" id="2117" />
+<TGConnectingPoint num="20" id="2118" />
+<TGConnectingPoint num="21" id="2119" />
+<TGConnectingPoint num="22" id="2120" />
+<TGConnectingPoint num="23" id="2121" />
+<TGConnectingPoint num="24" id="2122" />
+<TGConnectingPoint num="25" id="2123" />
+<TGConnectingPoint num="26" id="2124" />
+<TGConnectingPoint num="27" id="2125" />
+<TGConnectingPoint num="28" id="2126" />
+<TGConnectingPoint num="29" id="2127" />
+<TGConnectingPoint num="30" id="2128" />
+<TGConnectingPoint num="31" id="2129" />
+<TGConnectingPoint num="32" id="2130" />
+<TGConnectingPoint num="33" id="2131" />
+<TGConnectingPoint num="34" id="2132" />
+<TGConnectingPoint num="35" id="2133" />
+<TGConnectingPoint num="36" id="2134" />
+<TGConnectingPoint num="37" id="2135" />
+<TGConnectingPoint num="38" id="2136" />
+<TGConnectingPoint num="39" id="2137" />
+<TGConnectingPoint num="40" id="2138" />
+<TGConnectingPoint num="41" id="2139" />
+<TGConnectingPoint num="42" id="2140" />
+<TGConnectingPoint num="43" id="2141" />
+<TGConnectingPoint num="44" id="2142" />
+<TGConnectingPoint num="45" id="2143" />
+<TGConnectingPoint num="46" id="2144" />
+<TGConnectingPoint num="47" id="2145" />
+<TGConnectingPoint num="48" id="2146" />
+<TGConnectingPoint num="49" id="2147" />
+<TGConnectingPoint num="50" id="2148" />
+<TGConnectingPoint num="51" id="2149" />
+<TGConnectingPoint num="52" id="2150" />
+<TGConnectingPoint num="53" id="2151" />
+<TGConnectingPoint num="54" id="2152" />
+<TGConnectingPoint num="55" id="2153" />
+<TGConnectingPoint num="56" id="2154" />
+<TGConnectingPoint num="57" id="2155" />
+<TGConnectingPoint num="58" id="2156" />
+<TGConnectingPoint num="59" id="2157" />
+<TGConnectingPoint num="60" id="2158" />
+<TGConnectingPoint num="61" id="2159" />
+<TGConnectingPoint num="62" id="2160" />
+<TGConnectingPoint num="63" id="2161" />
+<TGConnectingPoint num="64" id="2162" />
+<TGConnectingPoint num="65" id="2163" />
+<TGConnectingPoint num="66" id="2164" />
+<TGConnectingPoint num="67" id="2165" />
+<TGConnectingPoint num="68" id="2166" />
+<TGConnectingPoint num="69" id="2167" />
+<TGConnectingPoint num="70" id="2168" />
+<TGConnectingPoint num="71" id="2169" />
+<TGConnectingPoint num="72" id="2170" />
+<TGConnectingPoint num="73" id="2171" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="2268" >
+<COMPONENT type="606" id="2265" >
 <cdparam x="196" y="76" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="283" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="OnboardCommunication" value="OnboardCommunication" />
-<TGConnectingPoint num="0" id="2194" />
-<TGConnectingPoint num="1" id="2195" />
-<TGConnectingPoint num="2" id="2196" />
-<TGConnectingPoint num="3" id="2197" />
-<TGConnectingPoint num="4" id="2198" />
-<TGConnectingPoint num="5" id="2199" />
-<TGConnectingPoint num="6" id="2200" />
-<TGConnectingPoint num="7" id="2201" />
-<TGConnectingPoint num="8" id="2202" />
-<TGConnectingPoint num="9" id="2203" />
-<TGConnectingPoint num="10" id="2204" />
-<TGConnectingPoint num="11" id="2205" />
-<TGConnectingPoint num="12" id="2206" />
-<TGConnectingPoint num="13" id="2207" />
-<TGConnectingPoint num="14" id="2208" />
-<TGConnectingPoint num="15" id="2209" />
-<TGConnectingPoint num="16" id="2210" />
-<TGConnectingPoint num="17" id="2211" />
-<TGConnectingPoint num="18" id="2212" />
-<TGConnectingPoint num="19" id="2213" />
-<TGConnectingPoint num="20" id="2214" />
-<TGConnectingPoint num="21" id="2215" />
-<TGConnectingPoint num="22" id="2216" />
-<TGConnectingPoint num="23" id="2217" />
-<TGConnectingPoint num="24" id="2218" />
-<TGConnectingPoint num="25" id="2219" />
-<TGConnectingPoint num="26" id="2220" />
-<TGConnectingPoint num="27" id="2221" />
-<TGConnectingPoint num="28" id="2222" />
-<TGConnectingPoint num="29" id="2223" />
-<TGConnectingPoint num="30" id="2224" />
-<TGConnectingPoint num="31" id="2225" />
-<TGConnectingPoint num="32" id="2226" />
-<TGConnectingPoint num="33" id="2227" />
-<TGConnectingPoint num="34" id="2228" />
-<TGConnectingPoint num="35" id="2229" />
-<TGConnectingPoint num="36" id="2230" />
-<TGConnectingPoint num="37" id="2231" />
-<TGConnectingPoint num="38" id="2232" />
-<TGConnectingPoint num="39" id="2233" />
-<TGConnectingPoint num="40" id="2234" />
-<TGConnectingPoint num="41" id="2235" />
-<TGConnectingPoint num="42" id="2236" />
-<TGConnectingPoint num="43" id="2237" />
-<TGConnectingPoint num="44" id="2238" />
-<TGConnectingPoint num="45" id="2239" />
-<TGConnectingPoint num="46" id="2240" />
-<TGConnectingPoint num="47" id="2241" />
-<TGConnectingPoint num="48" id="2242" />
-<TGConnectingPoint num="49" id="2243" />
-<TGConnectingPoint num="50" id="2244" />
-<TGConnectingPoint num="51" id="2245" />
-<TGConnectingPoint num="52" id="2246" />
-<TGConnectingPoint num="53" id="2247" />
-<TGConnectingPoint num="54" id="2248" />
-<TGConnectingPoint num="55" id="2249" />
-<TGConnectingPoint num="56" id="2250" />
-<TGConnectingPoint num="57" id="2251" />
-<TGConnectingPoint num="58" id="2252" />
-<TGConnectingPoint num="59" id="2253" />
-<TGConnectingPoint num="60" id="2254" />
-<TGConnectingPoint num="61" id="2255" />
-<TGConnectingPoint num="62" id="2256" />
-<TGConnectingPoint num="63" id="2257" />
-<TGConnectingPoint num="64" id="2258" />
-<TGConnectingPoint num="65" id="2259" />
-<TGConnectingPoint num="66" id="2260" />
-<TGConnectingPoint num="67" id="2261" />
-<TGConnectingPoint num="68" id="2262" />
-<TGConnectingPoint num="69" id="2263" />
-<TGConnectingPoint num="70" id="2264" />
-<TGConnectingPoint num="71" id="2265" />
-<TGConnectingPoint num="72" id="2266" />
-<TGConnectingPoint num="73" id="2267" />
+<TGConnectingPoint num="0" id="2191" />
+<TGConnectingPoint num="1" id="2192" />
+<TGConnectingPoint num="2" id="2193" />
+<TGConnectingPoint num="3" id="2194" />
+<TGConnectingPoint num="4" id="2195" />
+<TGConnectingPoint num="5" id="2196" />
+<TGConnectingPoint num="6" id="2197" />
+<TGConnectingPoint num="7" id="2198" />
+<TGConnectingPoint num="8" id="2199" />
+<TGConnectingPoint num="9" id="2200" />
+<TGConnectingPoint num="10" id="2201" />
+<TGConnectingPoint num="11" id="2202" />
+<TGConnectingPoint num="12" id="2203" />
+<TGConnectingPoint num="13" id="2204" />
+<TGConnectingPoint num="14" id="2205" />
+<TGConnectingPoint num="15" id="2206" />
+<TGConnectingPoint num="16" id="2207" />
+<TGConnectingPoint num="17" id="2208" />
+<TGConnectingPoint num="18" id="2209" />
+<TGConnectingPoint num="19" id="2210" />
+<TGConnectingPoint num="20" id="2211" />
+<TGConnectingPoint num="21" id="2212" />
+<TGConnectingPoint num="22" id="2213" />
+<TGConnectingPoint num="23" id="2214" />
+<TGConnectingPoint num="24" id="2215" />
+<TGConnectingPoint num="25" id="2216" />
+<TGConnectingPoint num="26" id="2217" />
+<TGConnectingPoint num="27" id="2218" />
+<TGConnectingPoint num="28" id="2219" />
+<TGConnectingPoint num="29" id="2220" />
+<TGConnectingPoint num="30" id="2221" />
+<TGConnectingPoint num="31" id="2222" />
+<TGConnectingPoint num="32" id="2223" />
+<TGConnectingPoint num="33" id="2224" />
+<TGConnectingPoint num="34" id="2225" />
+<TGConnectingPoint num="35" id="2226" />
+<TGConnectingPoint num="36" id="2227" />
+<TGConnectingPoint num="37" id="2228" />
+<TGConnectingPoint num="38" id="2229" />
+<TGConnectingPoint num="39" id="2230" />
+<TGConnectingPoint num="40" id="2231" />
+<TGConnectingPoint num="41" id="2232" />
+<TGConnectingPoint num="42" id="2233" />
+<TGConnectingPoint num="43" id="2234" />
+<TGConnectingPoint num="44" id="2235" />
+<TGConnectingPoint num="45" id="2236" />
+<TGConnectingPoint num="46" id="2237" />
+<TGConnectingPoint num="47" id="2238" />
+<TGConnectingPoint num="48" id="2239" />
+<TGConnectingPoint num="49" id="2240" />
+<TGConnectingPoint num="50" id="2241" />
+<TGConnectingPoint num="51" id="2242" />
+<TGConnectingPoint num="52" id="2243" />
+<TGConnectingPoint num="53" id="2244" />
+<TGConnectingPoint num="54" id="2245" />
+<TGConnectingPoint num="55" id="2246" />
+<TGConnectingPoint num="56" id="2247" />
+<TGConnectingPoint num="57" id="2248" />
+<TGConnectingPoint num="58" id="2249" />
+<TGConnectingPoint num="59" id="2250" />
+<TGConnectingPoint num="60" id="2251" />
+<TGConnectingPoint num="61" id="2252" />
+<TGConnectingPoint num="62" id="2253" />
+<TGConnectingPoint num="63" id="2254" />
+<TGConnectingPoint num="64" id="2255" />
+<TGConnectingPoint num="65" id="2256" />
+<TGConnectingPoint num="66" id="2257" />
+<TGConnectingPoint num="67" id="2258" />
+<TGConnectingPoint num="68" id="2259" />
+<TGConnectingPoint num="69" id="2260" />
+<TGConnectingPoint num="70" id="2261" />
+<TGConnectingPoint num="71" id="2262" />
+<TGConnectingPoint num="72" id="2263" />
+<TGConnectingPoint num="73" id="2264" />
 <extraparam>
 <Actor data="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="603" id="2184" >
-<father id="2268" num="0" />
-<cdparam x="214" y="334" />
+<SUBCOMPONENT type="605" id="2181" >
+<father id="2265" num="0" />
+<cdparam x="214" y="497" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="18" maxX="18" minY="-2" maxY="728" />
-<infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
-<TGConnectingPoint num="0" id="2176" />
-<TGConnectingPoint num="1" id="2177" />
-<TGConnectingPoint num="2" id="2178" />
-<TGConnectingPoint num="3" id="2179" />
-<TGConnectingPoint num="4" id="2180" />
-<TGConnectingPoint num="5" id="2181" />
-<TGConnectingPoint num="6" id="2182" />
-<TGConnectingPoint num="7" id="2183" />
+<infoparam name="timer expiration" value="{timer=ATST1}" />
+<TGConnectingPoint num="0" id="2173" />
+<TGConnectingPoint num="1" id="2174" />
+<TGConnectingPoint num="2" id="2175" />
+<TGConnectingPoint num="3" id="2176" />
+<TGConnectingPoint num="4" id="2177" />
+<TGConnectingPoint num="5" id="2178" />
+<TGConnectingPoint num="6" id="2179" />
+<TGConnectingPoint num="7" id="2180" />
 <extraparam>
-<Interval timer="ATST1" duration="10" />
+<Interval timer="ATST1" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="605" id="2193" >
-<father id="2268" num="1" />
-<cdparam x="214" y="497" />
+<SUBCOMPONENT type="603" id="2190" >
+<father id="2265" num="1" />
+<cdparam x="214" y="334" />
 <sizeparam width="15" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="18" maxX="18" minY="-2" maxY="728" />
-<infoparam name="timer expiration" value="{timer=ATST1}" />
-<TGConnectingPoint num="0" id="2185" />
-<TGConnectingPoint num="1" id="2186" />
-<TGConnectingPoint num="2" id="2187" />
-<TGConnectingPoint num="3" id="2188" />
-<TGConnectingPoint num="4" id="2189" />
-<TGConnectingPoint num="5" id="2190" />
-<TGConnectingPoint num="6" id="2191" />
-<TGConnectingPoint num="7" id="2192" />
+<infoparam name="setting timer" value="{timer=ATST1, duration=10}" />
+<TGConnectingPoint num="0" id="2182" />
+<TGConnectingPoint num="1" id="2183" />
+<TGConnectingPoint num="2" id="2184" />
+<TGConnectingPoint num="3" id="2185" />
+<TGConnectingPoint num="4" id="2186" />
+<TGConnectingPoint num="5" id="2187" />
+<TGConnectingPoint num="6" id="2188" />
+<TGConnectingPoint num="7" id="2189" />
 <extraparam>
-<Interval timer="ATST1" />
+<Interval timer="ATST1" duration="10" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="606" id="2343" >
+<COMPONENT type="606" id="2340" >
 <cdparam x="794" y="76" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Controller" value="AirTrafficController" />
-<TGConnectingPoint num="0" id="2269" />
-<TGConnectingPoint num="1" id="2270" />
-<TGConnectingPoint num="2" id="2271" />
-<TGConnectingPoint num="3" id="2272" />
-<TGConnectingPoint num="4" id="2273" />
-<TGConnectingPoint num="5" id="2274" />
-<TGConnectingPoint num="6" id="2275" />
-<TGConnectingPoint num="7" id="2276" />
-<TGConnectingPoint num="8" id="2277" />
-<TGConnectingPoint num="9" id="2278" />
-<TGConnectingPoint num="10" id="2279" />
-<TGConnectingPoint num="11" id="2280" />
-<TGConnectingPoint num="12" id="2281" />
-<TGConnectingPoint num="13" id="2282" />
-<TGConnectingPoint num="14" id="2283" />
-<TGConnectingPoint num="15" id="2284" />
-<TGConnectingPoint num="16" id="2285" />
-<TGConnectingPoint num="17" id="2286" />
-<TGConnectingPoint num="18" id="2287" />
-<TGConnectingPoint num="19" id="2288" />
-<TGConnectingPoint num="20" id="2289" />
-<TGConnectingPoint num="21" id="2290" />
-<TGConnectingPoint num="22" id="2291" />
-<TGConnectingPoint num="23" id="2292" />
-<TGConnectingPoint num="24" id="2293" />
-<TGConnectingPoint num="25" id="2294" />
-<TGConnectingPoint num="26" id="2295" />
-<TGConnectingPoint num="27" id="2296" />
-<TGConnectingPoint num="28" id="2297" />
-<TGConnectingPoint num="29" id="2298" />
-<TGConnectingPoint num="30" id="2299" />
-<TGConnectingPoint num="31" id="2300" />
-<TGConnectingPoint num="32" id="2301" />
-<TGConnectingPoint num="33" id="2302" />
-<TGConnectingPoint num="34" id="2303" />
-<TGConnectingPoint num="35" id="2304" />
-<TGConnectingPoint num="36" id="2305" />
-<TGConnectingPoint num="37" id="2306" />
-<TGConnectingPoint num="38" id="2307" />
-<TGConnectingPoint num="39" id="2308" />
-<TGConnectingPoint num="40" id="2309" />
-<TGConnectingPoint num="41" id="2310" />
-<TGConnectingPoint num="42" id="2311" />
-<TGConnectingPoint num="43" id="2312" />
-<TGConnectingPoint num="44" id="2313" />
-<TGConnectingPoint num="45" id="2314" />
-<TGConnectingPoint num="46" id="2315" />
-<TGConnectingPoint num="47" id="2316" />
-<TGConnectingPoint num="48" id="2317" />
-<TGConnectingPoint num="49" id="2318" />
-<TGConnectingPoint num="50" id="2319" />
-<TGConnectingPoint num="51" id="2320" />
-<TGConnectingPoint num="52" id="2321" />
-<TGConnectingPoint num="53" id="2322" />
-<TGConnectingPoint num="54" id="2323" />
-<TGConnectingPoint num="55" id="2324" />
-<TGConnectingPoint num="56" id="2325" />
-<TGConnectingPoint num="57" id="2326" />
-<TGConnectingPoint num="58" id="2327" />
-<TGConnectingPoint num="59" id="2328" />
-<TGConnectingPoint num="60" id="2329" />
-<TGConnectingPoint num="61" id="2330" />
-<TGConnectingPoint num="62" id="2331" />
-<TGConnectingPoint num="63" id="2332" />
-<TGConnectingPoint num="64" id="2333" />
-<TGConnectingPoint num="65" id="2334" />
-<TGConnectingPoint num="66" id="2335" />
-<TGConnectingPoint num="67" id="2336" />
-<TGConnectingPoint num="68" id="2337" />
-<TGConnectingPoint num="69" id="2338" />
-<TGConnectingPoint num="70" id="2339" />
-<TGConnectingPoint num="71" id="2340" />
-<TGConnectingPoint num="72" id="2341" />
-<TGConnectingPoint num="73" id="2342" />
+<TGConnectingPoint num="0" id="2266" />
+<TGConnectingPoint num="1" id="2267" />
+<TGConnectingPoint num="2" id="2268" />
+<TGConnectingPoint num="3" id="2269" />
+<TGConnectingPoint num="4" id="2270" />
+<TGConnectingPoint num="5" id="2271" />
+<TGConnectingPoint num="6" id="2272" />
+<TGConnectingPoint num="7" id="2273" />
+<TGConnectingPoint num="8" id="2274" />
+<TGConnectingPoint num="9" id="2275" />
+<TGConnectingPoint num="10" id="2276" />
+<TGConnectingPoint num="11" id="2277" />
+<TGConnectingPoint num="12" id="2278" />
+<TGConnectingPoint num="13" id="2279" />
+<TGConnectingPoint num="14" id="2280" />
+<TGConnectingPoint num="15" id="2281" />
+<TGConnectingPoint num="16" id="2282" />
+<TGConnectingPoint num="17" id="2283" />
+<TGConnectingPoint num="18" id="2284" />
+<TGConnectingPoint num="19" id="2285" />
+<TGConnectingPoint num="20" id="2286" />
+<TGConnectingPoint num="21" id="2287" />
+<TGConnectingPoint num="22" id="2288" />
+<TGConnectingPoint num="23" id="2289" />
+<TGConnectingPoint num="24" id="2290" />
+<TGConnectingPoint num="25" id="2291" />
+<TGConnectingPoint num="26" id="2292" />
+<TGConnectingPoint num="27" id="2293" />
+<TGConnectingPoint num="28" id="2294" />
+<TGConnectingPoint num="29" id="2295" />
+<TGConnectingPoint num="30" id="2296" />
+<TGConnectingPoint num="31" id="2297" />
+<TGConnectingPoint num="32" id="2298" />
+<TGConnectingPoint num="33" id="2299" />
+<TGConnectingPoint num="34" id="2300" />
+<TGConnectingPoint num="35" id="2301" />
+<TGConnectingPoint num="36" id="2302" />
+<TGConnectingPoint num="37" id="2303" />
+<TGConnectingPoint num="38" id="2304" />
+<TGConnectingPoint num="39" id="2305" />
+<TGConnectingPoint num="40" id="2306" />
+<TGConnectingPoint num="41" id="2307" />
+<TGConnectingPoint num="42" id="2308" />
+<TGConnectingPoint num="43" id="2309" />
+<TGConnectingPoint num="44" id="2310" />
+<TGConnectingPoint num="45" id="2311" />
+<TGConnectingPoint num="46" id="2312" />
+<TGConnectingPoint num="47" id="2313" />
+<TGConnectingPoint num="48" id="2314" />
+<TGConnectingPoint num="49" id="2315" />
+<TGConnectingPoint num="50" id="2316" />
+<TGConnectingPoint num="51" id="2317" />
+<TGConnectingPoint num="52" id="2318" />
+<TGConnectingPoint num="53" id="2319" />
+<TGConnectingPoint num="54" id="2320" />
+<TGConnectingPoint num="55" id="2321" />
+<TGConnectingPoint num="56" id="2322" />
+<TGConnectingPoint num="57" id="2323" />
+<TGConnectingPoint num="58" id="2324" />
+<TGConnectingPoint num="59" id="2325" />
+<TGConnectingPoint num="60" id="2326" />
+<TGConnectingPoint num="61" id="2327" />
+<TGConnectingPoint num="62" id="2328" />
+<TGConnectingPoint num="63" id="2329" />
+<TGConnectingPoint num="64" id="2330" />
+<TGConnectingPoint num="65" id="2331" />
+<TGConnectingPoint num="66" id="2332" />
+<TGConnectingPoint num="67" id="2333" />
+<TGConnectingPoint num="68" id="2334" />
+<TGConnectingPoint num="69" id="2335" />
+<TGConnectingPoint num="70" id="2336" />
+<TGConnectingPoint num="71" id="2337" />
+<TGConnectingPoint num="72" id="2338" />
+<TGConnectingPoint num="73" id="2339" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="606" id="2418" >
+<COMPONENT type="606" id="2415" >
 <cdparam x="33" y="76" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Pilot" value="Pilot" />
-<TGConnectingPoint num="0" id="2344" />
-<TGConnectingPoint num="1" id="2345" />
-<TGConnectingPoint num="2" id="2346" />
-<TGConnectingPoint num="3" id="2347" />
-<TGConnectingPoint num="4" id="2348" />
-<TGConnectingPoint num="5" id="2349" />
-<TGConnectingPoint num="6" id="2350" />
-<TGConnectingPoint num="7" id="2351" />
-<TGConnectingPoint num="8" id="2352" />
-<TGConnectingPoint num="9" id="2353" />
-<TGConnectingPoint num="10" id="2354" />
-<TGConnectingPoint num="11" id="2355" />
-<TGConnectingPoint num="12" id="2356" />
-<TGConnectingPoint num="13" id="2357" />
-<TGConnectingPoint num="14" id="2358" />
-<TGConnectingPoint num="15" id="2359" />
-<TGConnectingPoint num="16" id="2360" />
-<TGConnectingPoint num="17" id="2361" />
-<TGConnectingPoint num="18" id="2362" />
-<TGConnectingPoint num="19" id="2363" />
-<TGConnectingPoint num="20" id="2364" />
-<TGConnectingPoint num="21" id="2365" />
-<TGConnectingPoint num="22" id="2366" />
-<TGConnectingPoint num="23" id="2367" />
-<TGConnectingPoint num="24" id="2368" />
-<TGConnectingPoint num="25" id="2369" />
-<TGConnectingPoint num="26" id="2370" />
-<TGConnectingPoint num="27" id="2371" />
-<TGConnectingPoint num="28" id="2372" />
-<TGConnectingPoint num="29" id="2373" />
-<TGConnectingPoint num="30" id="2374" />
-<TGConnectingPoint num="31" id="2375" />
-<TGConnectingPoint num="32" id="2376" />
-<TGConnectingPoint num="33" id="2377" />
-<TGConnectingPoint num="34" id="2378" />
-<TGConnectingPoint num="35" id="2379" />
-<TGConnectingPoint num="36" id="2380" />
-<TGConnectingPoint num="37" id="2381" />
-<TGConnectingPoint num="38" id="2382" />
-<TGConnectingPoint num="39" id="2383" />
-<TGConnectingPoint num="40" id="2384" />
-<TGConnectingPoint num="41" id="2385" />
-<TGConnectingPoint num="42" id="2386" />
-<TGConnectingPoint num="43" id="2387" />
-<TGConnectingPoint num="44" id="2388" />
-<TGConnectingPoint num="45" id="2389" />
-<TGConnectingPoint num="46" id="2390" />
-<TGConnectingPoint num="47" id="2391" />
-<TGConnectingPoint num="48" id="2392" />
-<TGConnectingPoint num="49" id="2393" />
-<TGConnectingPoint num="50" id="2394" />
-<TGConnectingPoint num="51" id="2395" />
-<TGConnectingPoint num="52" id="2396" />
-<TGConnectingPoint num="53" id="2397" />
-<TGConnectingPoint num="54" id="2398" />
-<TGConnectingPoint num="55" id="2399" />
-<TGConnectingPoint num="56" id="2400" />
-<TGConnectingPoint num="57" id="2401" />
-<TGConnectingPoint num="58" id="2402" />
-<TGConnectingPoint num="59" id="2403" />
-<TGConnectingPoint num="60" id="2404" />
-<TGConnectingPoint num="61" id="2405" />
-<TGConnectingPoint num="62" id="2406" />
-<TGConnectingPoint num="63" id="2407" />
-<TGConnectingPoint num="64" id="2408" />
-<TGConnectingPoint num="65" id="2409" />
-<TGConnectingPoint num="66" id="2410" />
-<TGConnectingPoint num="67" id="2411" />
-<TGConnectingPoint num="68" id="2412" />
-<TGConnectingPoint num="69" id="2413" />
-<TGConnectingPoint num="70" id="2414" />
-<TGConnectingPoint num="71" id="2415" />
-<TGConnectingPoint num="72" id="2416" />
-<TGConnectingPoint num="73" id="2417" />
+<TGConnectingPoint num="0" id="2341" />
+<TGConnectingPoint num="1" id="2342" />
+<TGConnectingPoint num="2" id="2343" />
+<TGConnectingPoint num="3" id="2344" />
+<TGConnectingPoint num="4" id="2345" />
+<TGConnectingPoint num="5" id="2346" />
+<TGConnectingPoint num="6" id="2347" />
+<TGConnectingPoint num="7" id="2348" />
+<TGConnectingPoint num="8" id="2349" />
+<TGConnectingPoint num="9" id="2350" />
+<TGConnectingPoint num="10" id="2351" />
+<TGConnectingPoint num="11" id="2352" />
+<TGConnectingPoint num="12" id="2353" />
+<TGConnectingPoint num="13" id="2354" />
+<TGConnectingPoint num="14" id="2355" />
+<TGConnectingPoint num="15" id="2356" />
+<TGConnectingPoint num="16" id="2357" />
+<TGConnectingPoint num="17" id="2358" />
+<TGConnectingPoint num="18" id="2359" />
+<TGConnectingPoint num="19" id="2360" />
+<TGConnectingPoint num="20" id="2361" />
+<TGConnectingPoint num="21" id="2362" />
+<TGConnectingPoint num="22" id="2363" />
+<TGConnectingPoint num="23" id="2364" />
+<TGConnectingPoint num="24" id="2365" />
+<TGConnectingPoint num="25" id="2366" />
+<TGConnectingPoint num="26" id="2367" />
+<TGConnectingPoint num="27" id="2368" />
+<TGConnectingPoint num="28" id="2369" />
+<TGConnectingPoint num="29" id="2370" />
+<TGConnectingPoint num="30" id="2371" />
+<TGConnectingPoint num="31" id="2372" />
+<TGConnectingPoint num="32" id="2373" />
+<TGConnectingPoint num="33" id="2374" />
+<TGConnectingPoint num="34" id="2375" />
+<TGConnectingPoint num="35" id="2376" />
+<TGConnectingPoint num="36" id="2377" />
+<TGConnectingPoint num="37" id="2378" />
+<TGConnectingPoint num="38" id="2379" />
+<TGConnectingPoint num="39" id="2380" />
+<TGConnectingPoint num="40" id="2381" />
+<TGConnectingPoint num="41" id="2382" />
+<TGConnectingPoint num="42" id="2383" />
+<TGConnectingPoint num="43" id="2384" />
+<TGConnectingPoint num="44" id="2385" />
+<TGConnectingPoint num="45" id="2386" />
+<TGConnectingPoint num="46" id="2387" />
+<TGConnectingPoint num="47" id="2388" />
+<TGConnectingPoint num="48" id="2389" />
+<TGConnectingPoint num="49" id="2390" />
+<TGConnectingPoint num="50" id="2391" />
+<TGConnectingPoint num="51" id="2392" />
+<TGConnectingPoint num="52" id="2393" />
+<TGConnectingPoint num="53" id="2394" />
+<TGConnectingPoint num="54" id="2395" />
+<TGConnectingPoint num="55" id="2396" />
+<TGConnectingPoint num="56" id="2397" />
+<TGConnectingPoint num="57" id="2398" />
+<TGConnectingPoint num="58" id="2399" />
+<TGConnectingPoint num="59" id="2400" />
+<TGConnectingPoint num="60" id="2401" />
+<TGConnectingPoint num="61" id="2402" />
+<TGConnectingPoint num="62" id="2403" />
+<TGConnectingPoint num="63" id="2404" />
+<TGConnectingPoint num="64" id="2405" />
+<TGConnectingPoint num="65" id="2406" />
+<TGConnectingPoint num="66" id="2407" />
+<TGConnectingPoint num="67" id="2408" />
+<TGConnectingPoint num="68" id="2409" />
+<TGConnectingPoint num="69" id="2410" />
+<TGConnectingPoint num="70" id="2411" />
+<TGConnectingPoint num="71" id="2412" />
+<TGConnectingPoint num="72" id="2413" />
+<TGConnectingPoint num="73" id="2414" />
 <extraparam>
 <Actor data="true" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="2435" >
+<COMPONENT type="301" id="2432" >
 <cdparam x="385" y="235" />
 <sizeparam width="73" height="39" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3999,22 +3999,22 @@ CC is lost
 CC is lost
    
 " />
-<TGConnectingPoint num="0" id="2419" />
-<TGConnectingPoint num="1" id="2420" />
-<TGConnectingPoint num="2" id="2421" />
-<TGConnectingPoint num="3" id="2422" />
-<TGConnectingPoint num="4" id="2423" />
-<TGConnectingPoint num="5" id="2424" />
-<TGConnectingPoint num="6" id="2425" />
-<TGConnectingPoint num="7" id="2426" />
-<TGConnectingPoint num="8" id="2427" />
-<TGConnectingPoint num="9" id="2428" />
-<TGConnectingPoint num="10" id="2429" />
-<TGConnectingPoint num="11" id="2430" />
-<TGConnectingPoint num="12" id="2431" />
-<TGConnectingPoint num="13" id="2432" />
-<TGConnectingPoint num="14" id="2433" />
-<TGConnectingPoint num="15" id="2434" />
+<TGConnectingPoint num="0" id="2416" />
+<TGConnectingPoint num="1" id="2417" />
+<TGConnectingPoint num="2" id="2418" />
+<TGConnectingPoint num="3" id="2419" />
+<TGConnectingPoint num="4" id="2420" />
+<TGConnectingPoint num="5" id="2421" />
+<TGConnectingPoint num="6" id="2422" />
+<TGConnectingPoint num="7" id="2423" />
+<TGConnectingPoint num="8" id="2424" />
+<TGConnectingPoint num="9" id="2425" />
+<TGConnectingPoint num="10" id="2426" />
+<TGConnectingPoint num="11" id="2427" />
+<TGConnectingPoint num="12" id="2428" />
+<TGConnectingPoint num="13" id="2429" />
+<TGConnectingPoint num="14" id="2430" />
+<TGConnectingPoint num="15" id="2431" />
 <extraparam>
 <Line value="    " />
 <Line value="CC is lost" />
@@ -4022,7 +4022,7 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="2452" >
+<COMPONENT type="301" id="2449" >
 <cdparam x="387" y="639" />
 <sizeparam width="73" height="39" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -4031,22 +4031,22 @@ CC is lost
 CC is lost
    
 " />
-<TGConnectingPoint num="0" id="2436" />
-<TGConnectingPoint num="1" id="2437" />
-<TGConnectingPoint num="2" id="2438" />
-<TGConnectingPoint num="3" id="2439" />
-<TGConnectingPoint num="4" id="2440" />
-<TGConnectingPoint num="5" id="2441" />
-<TGConnectingPoint num="6" id="2442" />
-<TGConnectingPoint num="7" id="2443" />
-<TGConnectingPoint num="8" id="2444" />
-<TGConnectingPoint num="9" id="2445" />
-<TGConnectingPoint num="10" id="2446" />
-<TGConnectingPoint num="11" id="2447" />
-<TGConnectingPoint num="12" id="2448" />
-<TGConnectingPoint num="13" id="2449" />
-<TGConnectingPoint num="14" id="2450" />
-<TGConnectingPoint num="15" id="2451" />
+<TGConnectingPoint num="0" id="2433" />
+<TGConnectingPoint num="1" id="2434" />
+<TGConnectingPoint num="2" id="2435" />
+<TGConnectingPoint num="3" id="2436" />
+<TGConnectingPoint num="4" id="2437" />
+<TGConnectingPoint num="5" id="2438" />
+<TGConnectingPoint num="6" id="2439" />
+<TGConnectingPoint num="7" id="2440" />
+<TGConnectingPoint num="8" id="2441" />
+<TGConnectingPoint num="9" id="2442" />
+<TGConnectingPoint num="10" id="2443" />
+<TGConnectingPoint num="11" id="2444" />
+<TGConnectingPoint num="12" id="2445" />
+<TGConnectingPoint num="13" id="2446" />
+<TGConnectingPoint num="14" id="2447" />
+<TGConnectingPoint num="15" id="2448" />
 <extraparam>
 <Line value="    " />
 <Line value="CC is lost" />
@@ -4054,7 +4054,7 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="2469" >
+<COMPONENT type="301" id="2466" >
 <cdparam x="384" y="440" />
 <sizeparam width="73" height="39" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -4063,22 +4063,22 @@ CC is lost
 CC is lost
    
 " />
-<TGConnectingPoint num="0" id="2453" />
-<TGConnectingPoint num="1" id="2454" />
-<TGConnectingPoint num="2" id="2455" />
-<TGConnectingPoint num="3" id="2456" />
-<TGConnectingPoint num="4" id="2457" />
-<TGConnectingPoint num="5" id="2458" />
-<TGConnectingPoint num="6" id="2459" />
-<TGConnectingPoint num="7" id="2460" />
-<TGConnectingPoint num="8" id="2461" />
-<TGConnectingPoint num="9" id="2462" />
-<TGConnectingPoint num="10" id="2463" />
-<TGConnectingPoint num="11" id="2464" />
-<TGConnectingPoint num="12" id="2465" />
-<TGConnectingPoint num="13" id="2466" />
-<TGConnectingPoint num="14" id="2467" />
-<TGConnectingPoint num="15" id="2468" />
+<TGConnectingPoint num="0" id="2450" />
+<TGConnectingPoint num="1" id="2451" />
+<TGConnectingPoint num="2" id="2452" />
+<TGConnectingPoint num="3" id="2453" />
+<TGConnectingPoint num="4" id="2454" />
+<TGConnectingPoint num="5" id="2455" />
+<TGConnectingPoint num="6" id="2456" />
+<TGConnectingPoint num="7" id="2457" />
+<TGConnectingPoint num="8" id="2458" />
+<TGConnectingPoint num="9" id="2459" />
+<TGConnectingPoint num="10" id="2460" />
+<TGConnectingPoint num="11" id="2461" />
+<TGConnectingPoint num="12" id="2462" />
+<TGConnectingPoint num="13" id="2463" />
+<TGConnectingPoint num="14" id="2464" />
+<TGConnectingPoint num="15" id="2465" />
 <extraparam>
 <Line value="    " />
 <Line value="CC is lost" />
@@ -4086,158 +4086,158 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="107" id="2470" >
+<CONNECTOR type="107" id="2467" >
 <cdparam x="201" y="726" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INerror" />
-<P1  x="201" y="726" id="2258" />
-<P2  x="38" y="726" id="2408" />
+<P1  x="201" y="726" id="2255" />
+<P2  x="38" y="726" id="2405" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2471" >
+<CONNECTOR type="106" id="2468" >
 <cdparam x="620" y="616" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="620" y="616" id="2079" />
-<P2  x="447" y="616" id="2154" />
+<P1  x="620" y="616" id="2076" />
+<P2  x="447" y="616" id="2151" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2472" >
+<CONNECTOR type="107" id="2469" >
 <cdparam x="799" y="596" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconresp" />
-<P1  x="799" y="596" id="2320" />
-<P2  x="620" y="596" id="2077" />
+<P1  x="799" y="596" id="2317" />
+<P2  x="620" y="596" id="2074" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2473" >
+<CONNECTOR type="107" id="2470" >
 <cdparam x="620" y="576" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconind" />
-<P1  x="620" y="576" id="2075" />
-<P2  x="799" y="576" id="2318" />
+<P1  x="620" y="576" id="2072" />
+<P2  x="799" y="576" id="2315" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2474" >
+<CONNECTOR type="106" id="2471" >
 <cdparam x="447" y="556" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="447" y="556" id="2148" />
-<P2  x="620" y="556" id="2073" />
+<P1  x="447" y="556" id="2145" />
+<P2  x="620" y="556" id="2070" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2475" >
+<CONNECTOR type="106" id="2472" >
 <cdparam x="201" y="536" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="201" y="536" id="2239" />
-<P2  x="447" y="536" id="2146" />
+<P1  x="201" y="536" id="2236" />
+<P2  x="447" y="536" id="2143" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2476" >
+<CONNECTOR type="106" id="2473" >
 <cdparam x="620" y="406" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="620" y="406" id="2058" />
-<P2  x="447" y="406" id="2133" />
+<P1  x="620" y="406" id="2055" />
+<P2  x="447" y="406" id="2130" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2477" >
+<CONNECTOR type="107" id="2474" >
 <cdparam x="799" y="386" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconresp" />
-<P1  x="799" y="386" id="2299" />
-<P2  x="620" y="386" id="2056" />
+<P1  x="799" y="386" id="2296" />
+<P2  x="620" y="386" id="2053" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2480" >
+<CONNECTOR type="107" id="2477" >
 <cdparam x="620" y="356" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconind" />
-<P1  x="620" y="356" id="2053" />
-<P2  x="799" y="356" id="2296" />
+<P1  x="620" y="356" id="2050" />
+<P2  x="799" y="356" id="2293" />
 <Point x="619" y="355" />
 <Point x="621" y="355" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2478" >
-<father id="2480" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2475" >
+<father id="2477" num="0" />
 <cdparam x="619" y="355" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2479" >
-<father id="2480" num="1" />
+<SUBCOMPONENT type="-1" id="2476" >
+<father id="2477" num="1" />
 <cdparam x="621" y="355" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="106" id="2481" >
+<CONNECTOR type="106" id="2478" >
 <cdparam x="461" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="447" y="336" id="2126" />
-<P2  x="620" y="336" id="2051" />
+<P1  x="447" y="336" id="2123" />
+<P2  x="620" y="336" id="2048" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2482" >
+<CONNECTOR type="106" id="2479" >
 <cdparam x="201" y="316" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="201" y="316" id="2217" />
-<P2  x="447" y="316" id="2124" />
+<P1  x="201" y="316" id="2214" />
+<P2  x="447" y="316" id="2121" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2483" >
+<CONNECTOR type="106" id="2480" >
 <cdparam x="620" y="226" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CC" />
-<P1  x="620" y="216" id="2039" />
-<P2  x="447" y="216" id="2114" />
+<P1  x="620" y="216" id="2036" />
+<P2  x="447" y="216" id="2111" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2484" >
+<CONNECTOR type="106" id="2481" >
 <cdparam x="461" y="146" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="447" y="146" id="2107" />
-<P2  x="620" y="146" id="2032" />
+<P1  x="447" y="146" id="2104" />
+<P2  x="620" y="146" id="2029" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="106" id="2485" >
+<CONNECTOR type="106" id="2482" >
 <cdparam x="201" y="126" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="CR" />
-<P1  x="201" y="126" id="2198" />
-<P2  x="447" y="126" id="2105" />
+<P1  x="201" y="126" id="2195" />
+<P2  x="447" y="126" id="2102" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2486" >
+<CONNECTOR type="107" id="2483" >
 <cdparam x="10" y="113" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="INconreq" />
-<P1  x="38" y="106" id="2346" />
-<P2  x="201" y="106" id="2196" />
+<P1  x="38" y="106" id="2343" />
+<P2  x="201" y="106" id="2193" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2487" >
+<CONNECTOR type="107" id="2484" >
 <cdparam x="798" y="197" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconresp" />
-<P1  x="799" y="196" id="2280" />
-<P2  x="620" y="196" id="2037" />
+<P1  x="799" y="196" id="2277" />
+<P2  x="620" y="196" id="2034" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="107" id="2488" >
+<CONNECTOR type="107" id="2485" >
 <cdparam x="620" y="167" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from instance to instance" value="INconind" />
-<P1  x="620" y="166" id="2034" />
-<P2  x="799" y="166" id="2277" />
+<P1  x="620" y="166" id="2031" />
+<P2  x="799" y="166" id="2274" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -4253,18 +4253,19 @@ CC is lost
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
+<considerTimingOperators value="true" />
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="2494" >
+<CONNECTOR type="5002" id="2491" >
 <cdparam x="117" y="266" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="2491" />
-<TGConnectingPoint num="1" id="2492" />
-<TGConnectingPoint num="2" id="2493" />
-<P1  x="117" y="266" id="2547" />
-<P2  x="464" y="267" id="2573" />
+<TGConnectingPoint num="0" id="2488" />
+<TGConnectingPoint num="1" id="2489" />
+<TGConnectingPoint num="2" id="2490" />
+<P1  x="117" y="266" id="2544" />
+<P2  x="464" y="267" id="2570" />
 <Point x="117" y="308" />
 <Point x="464" y="308" />
 <AutomaticDrawing  data="true" />
@@ -4273,86 +4274,86 @@ CC is lost
 <osd value="out CC()" />
 <isd value="in CR()" />
 <oso value="out CR()" />
-<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="2489" >
-<father id="2494" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2486" >
+<father id="2491" num="0" />
 <cdparam x="117" y="308" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2490" >
-<father id="2494" num="1" />
+<SUBCOMPONENT type="-1" id="2487" >
+<father id="2491" num="1" />
 <cdparam x="464" y="308" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="2496" >
+<CONNECTOR type="5002" id="2493" >
 <cdparam x="449" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2495" />
-<P1  x="424" y="104" id="2589" />
-<P2  x="424" y="143" id="2559" />
+<TGConnectingPoint num="0" id="2492" />
+<P1  x="424" y="104" id="2586" />
+<P2  x="424" y="143" id="2556" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in INconind()" />
 <osd value="out INconind()" />
 <isd value="in INconresp()" />
 <oso value="out INconresp()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="2498" >
+<CONNECTOR type="5002" id="2495" >
 <cdparam x="145" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="2497" />
-<P1  x="158" y="104" id="2614" />
-<P2  x="158" y="142" id="2534" />
+<TGConnectingPoint num="0" id="2494" />
+<P1  x="158" y="104" id="2611" />
+<P2  x="158" y="142" id="2531" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in INconconf()" />
 <osd value="out INconconf()" />
 <isd value="in INconreq()" />
 <oso value="out INconreq()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="301" id="2515" >
+<COMPONENT type="301" id="2512" >
 <cdparam x="235" y="287" />
 <sizeparam width="111" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Unlossy channel
 " />
-<TGConnectingPoint num="0" id="2499" />
-<TGConnectingPoint num="1" id="2500" />
-<TGConnectingPoint num="2" id="2501" />
-<TGConnectingPoint num="3" id="2502" />
-<TGConnectingPoint num="4" id="2503" />
-<TGConnectingPoint num="5" id="2504" />
-<TGConnectingPoint num="6" id="2505" />
-<TGConnectingPoint num="7" id="2506" />
-<TGConnectingPoint num="8" id="2507" />
-<TGConnectingPoint num="9" id="2508" />
-<TGConnectingPoint num="10" id="2509" />
-<TGConnectingPoint num="11" id="2510" />
-<TGConnectingPoint num="12" id="2511" />
-<TGConnectingPoint num="13" id="2512" />
-<TGConnectingPoint num="14" id="2513" />
-<TGConnectingPoint num="15" id="2514" />
+<TGConnectingPoint num="0" id="2496" />
+<TGConnectingPoint num="1" id="2497" />
+<TGConnectingPoint num="2" id="2498" />
+<TGConnectingPoint num="3" id="2499" />
+<TGConnectingPoint num="4" id="2500" />
+<TGConnectingPoint num="5" id="2501" />
+<TGConnectingPoint num="6" id="2502" />
+<TGConnectingPoint num="7" id="2503" />
+<TGConnectingPoint num="8" id="2504" />
+<TGConnectingPoint num="9" id="2505" />
+<TGConnectingPoint num="10" id="2506" />
+<TGConnectingPoint num="11" id="2507" />
+<TGConnectingPoint num="12" id="2508" />
+<TGConnectingPoint num="13" id="2509" />
+<TGConnectingPoint num="14" id="2510" />
+<TGConnectingPoint num="15" id="2511" />
 <extraparam>
 <Line value="Unlossy channel" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="2532" >
+<COMPONENT type="301" id="2529" >
 <cdparam x="10" y="332" />
 <sizeparam width="588" height="51" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -4362,22 +4363,22 @@ CC is lost
   White squares: the protocol entities communicate bu FIFO queues with their underlying network.
    
 " />
-<TGConnectingPoint num="0" id="2516" />
-<TGConnectingPoint num="1" id="2517" />
-<TGConnectingPoint num="2" id="2518" />
-<TGConnectingPoint num="3" id="2519" />
-<TGConnectingPoint num="4" id="2520" />
-<TGConnectingPoint num="5" id="2521" />
-<TGConnectingPoint num="6" id="2522" />
-<TGConnectingPoint num="7" id="2523" />
-<TGConnectingPoint num="8" id="2524" />
-<TGConnectingPoint num="9" id="2525" />
-<TGConnectingPoint num="10" id="2526" />
-<TGConnectingPoint num="11" id="2527" />
-<TGConnectingPoint num="12" id="2528" />
-<TGConnectingPoint num="13" id="2529" />
-<TGConnectingPoint num="14" id="2530" />
-<TGConnectingPoint num="15" id="2531" />
+<TGConnectingPoint num="0" id="2513" />
+<TGConnectingPoint num="1" id="2514" />
+<TGConnectingPoint num="2" id="2515" />
+<TGConnectingPoint num="3" id="2516" />
+<TGConnectingPoint num="4" id="2517" />
+<TGConnectingPoint num="5" id="2518" />
+<TGConnectingPoint num="6" id="2519" />
+<TGConnectingPoint num="7" id="2520" />
+<TGConnectingPoint num="8" id="2521" />
+<TGConnectingPoint num="9" id="2522" />
+<TGConnectingPoint num="10" id="2523" />
+<TGConnectingPoint num="11" id="2524" />
+<TGConnectingPoint num="12" id="2525" />
+<TGConnectingPoint num="13" id="2526" />
+<TGConnectingPoint num="14" id="2527" />
+<TGConnectingPoint num="15" id="2528" />
 <extraparam>
 <Line value="" />
 <Line value="  Black squares: the protocol entities communicate by rendezvous with the Pilot and the Controller." />
@@ -4386,36 +4387,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="2557" >
+<COMPONENT type="5000" id="2554" >
 <cdparam x="77" y="142" />
 <sizeparam width="163" height="124" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="OnBoardCommunication" />
-<TGConnectingPoint num="0" id="2533" />
-<TGConnectingPoint num="1" id="2534" />
-<TGConnectingPoint num="2" id="2535" />
-<TGConnectingPoint num="3" id="2536" />
-<TGConnectingPoint num="4" id="2537" />
-<TGConnectingPoint num="5" id="2538" />
-<TGConnectingPoint num="6" id="2539" />
-<TGConnectingPoint num="7" id="2540" />
-<TGConnectingPoint num="8" id="2541" />
-<TGConnectingPoint num="9" id="2542" />
-<TGConnectingPoint num="10" id="2543" />
-<TGConnectingPoint num="11" id="2544" />
-<TGConnectingPoint num="12" id="2545" />
-<TGConnectingPoint num="13" id="2546" />
-<TGConnectingPoint num="14" id="2547" />
-<TGConnectingPoint num="15" id="2548" />
-<TGConnectingPoint num="16" id="2549" />
-<TGConnectingPoint num="17" id="2550" />
-<TGConnectingPoint num="18" id="2551" />
-<TGConnectingPoint num="19" id="2552" />
-<TGConnectingPoint num="20" id="2553" />
-<TGConnectingPoint num="21" id="2554" />
-<TGConnectingPoint num="22" id="2555" />
-<TGConnectingPoint num="23" id="2556" />
+<TGConnectingPoint num="0" id="2530" />
+<TGConnectingPoint num="1" id="2531" />
+<TGConnectingPoint num="2" id="2532" />
+<TGConnectingPoint num="3" id="2533" />
+<TGConnectingPoint num="4" id="2534" />
+<TGConnectingPoint num="5" id="2535" />
+<TGConnectingPoint num="6" id="2536" />
+<TGConnectingPoint num="7" id="2537" />
+<TGConnectingPoint num="8" id="2538" />
+<TGConnectingPoint num="9" id="2539" />
+<TGConnectingPoint num="10" id="2540" />
+<TGConnectingPoint num="11" id="2541" />
+<TGConnectingPoint num="12" id="2542" />
+<TGConnectingPoint num="13" id="2543" />
+<TGConnectingPoint num="14" id="2544" />
+<TGConnectingPoint num="15" id="2545" />
+<TGConnectingPoint num="16" id="2546" />
+<TGConnectingPoint num="17" id="2547" />
+<TGConnectingPoint num="18" id="2548" />
+<TGConnectingPoint num="19" id="2549" />
+<TGConnectingPoint num="20" id="2550" />
+<TGConnectingPoint num="21" id="2551" />
+<TGConnectingPoint num="22" id="2552" />
+<TGConnectingPoint num="23" id="2553" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -4426,36 +4427,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="2582" >
+<COMPONENT type="5000" id="2579" >
 <cdparam x="344" y="143" />
 <sizeparam width="161" height="124" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="GroundCommunication" />
-<TGConnectingPoint num="0" id="2558" />
-<TGConnectingPoint num="1" id="2559" />
-<TGConnectingPoint num="2" id="2560" />
-<TGConnectingPoint num="3" id="2561" />
-<TGConnectingPoint num="4" id="2562" />
-<TGConnectingPoint num="5" id="2563" />
-<TGConnectingPoint num="6" id="2564" />
-<TGConnectingPoint num="7" id="2565" />
-<TGConnectingPoint num="8" id="2566" />
-<TGConnectingPoint num="9" id="2567" />
-<TGConnectingPoint num="10" id="2568" />
-<TGConnectingPoint num="11" id="2569" />
-<TGConnectingPoint num="12" id="2570" />
-<TGConnectingPoint num="13" id="2571" />
-<TGConnectingPoint num="14" id="2572" />
-<TGConnectingPoint num="15" id="2573" />
-<TGConnectingPoint num="16" id="2574" />
-<TGConnectingPoint num="17" id="2575" />
-<TGConnectingPoint num="18" id="2576" />
-<TGConnectingPoint num="19" id="2577" />
-<TGConnectingPoint num="20" id="2578" />
-<TGConnectingPoint num="21" id="2579" />
-<TGConnectingPoint num="22" id="2580" />
-<TGConnectingPoint num="23" id="2581" />
+<TGConnectingPoint num="0" id="2555" />
+<TGConnectingPoint num="1" id="2556" />
+<TGConnectingPoint num="2" id="2557" />
+<TGConnectingPoint num="3" id="2558" />
+<TGConnectingPoint num="4" id="2559" />
+<TGConnectingPoint num="5" id="2560" />
+<TGConnectingPoint num="6" id="2561" />
+<TGConnectingPoint num="7" id="2562" />
+<TGConnectingPoint num="8" id="2563" />
+<TGConnectingPoint num="9" id="2564" />
+<TGConnectingPoint num="10" id="2565" />
+<TGConnectingPoint num="11" id="2566" />
+<TGConnectingPoint num="12" id="2567" />
+<TGConnectingPoint num="13" id="2568" />
+<TGConnectingPoint num="14" id="2569" />
+<TGConnectingPoint num="15" id="2570" />
+<TGConnectingPoint num="16" id="2571" />
+<TGConnectingPoint num="17" id="2572" />
+<TGConnectingPoint num="18" id="2573" />
+<TGConnectingPoint num="19" id="2574" />
+<TGConnectingPoint num="20" id="2575" />
+<TGConnectingPoint num="21" id="2576" />
+<TGConnectingPoint num="22" id="2577" />
+<TGConnectingPoint num="23" id="2578" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -4466,36 +4467,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="2607" >
+<COMPONENT type="5000" id="2604" >
 <cdparam x="346" y="10" />
 <sizeparam width="157" height="94" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="2583" />
-<TGConnectingPoint num="1" id="2584" />
-<TGConnectingPoint num="2" id="2585" />
-<TGConnectingPoint num="3" id="2586" />
-<TGConnectingPoint num="4" id="2587" />
-<TGConnectingPoint num="5" id="2588" />
-<TGConnectingPoint num="6" id="2589" />
-<TGConnectingPoint num="7" id="2590" />
-<TGConnectingPoint num="8" id="2591" />
-<TGConnectingPoint num="9" id="2592" />
-<TGConnectingPoint num="10" id="2593" />
-<TGConnectingPoint num="11" id="2594" />
-<TGConnectingPoint num="12" id="2595" />
-<TGConnectingPoint num="13" id="2596" />
-<TGConnectingPoint num="14" id="2597" />
-<TGConnectingPoint num="15" id="2598" />
-<TGConnectingPoint num="16" id="2599" />
-<TGConnectingPoint num="17" id="2600" />
-<TGConnectingPoint num="18" id="2601" />
-<TGConnectingPoint num="19" id="2602" />
-<TGConnectingPoint num="20" id="2603" />
-<TGConnectingPoint num="21" id="2604" />
-<TGConnectingPoint num="22" id="2605" />
-<TGConnectingPoint num="23" id="2606" />
+<TGConnectingPoint num="0" id="2580" />
+<TGConnectingPoint num="1" id="2581" />
+<TGConnectingPoint num="2" id="2582" />
+<TGConnectingPoint num="3" id="2583" />
+<TGConnectingPoint num="4" id="2584" />
+<TGConnectingPoint num="5" id="2585" />
+<TGConnectingPoint num="6" id="2586" />
+<TGConnectingPoint num="7" id="2587" />
+<TGConnectingPoint num="8" id="2588" />
+<TGConnectingPoint num="9" id="2589" />
+<TGConnectingPoint num="10" id="2590" />
+<TGConnectingPoint num="11" id="2591" />
+<TGConnectingPoint num="12" id="2592" />
+<TGConnectingPoint num="13" id="2593" />
+<TGConnectingPoint num="14" id="2594" />
+<TGConnectingPoint num="15" id="2595" />
+<TGConnectingPoint num="16" id="2596" />
+<TGConnectingPoint num="17" id="2597" />
+<TGConnectingPoint num="18" id="2598" />
+<TGConnectingPoint num="19" id="2599" />
+<TGConnectingPoint num="20" id="2600" />
+<TGConnectingPoint num="21" id="2601" />
+<TGConnectingPoint num="22" id="2602" />
+<TGConnectingPoint num="23" id="2603" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -4504,36 +4505,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="2632" >
+<COMPONENT type="5000" id="2629" >
 <cdparam x="76" y="10" />
 <sizeparam width="165" height="94" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Pilot" />
-<TGConnectingPoint num="0" id="2608" />
-<TGConnectingPoint num="1" id="2609" />
-<TGConnectingPoint num="2" id="2610" />
-<TGConnectingPoint num="3" id="2611" />
-<TGConnectingPoint num="4" id="2612" />
-<TGConnectingPoint num="5" id="2613" />
-<TGConnectingPoint num="6" id="2614" />
-<TGConnectingPoint num="7" id="2615" />
-<TGConnectingPoint num="8" id="2616" />
-<TGConnectingPoint num="9" id="2617" />
-<TGConnectingPoint num="10" id="2618" />
-<TGConnectingPoint num="11" id="2619" />
-<TGConnectingPoint num="12" id="2620" />
-<TGConnectingPoint num="13" id="2621" />
-<TGConnectingPoint num="14" id="2622" />
-<TGConnectingPoint num="15" id="2623" />
-<TGConnectingPoint num="16" id="2624" />
-<TGConnectingPoint num="17" id="2625" />
-<TGConnectingPoint num="18" id="2626" />
-<TGConnectingPoint num="19" id="2627" />
-<TGConnectingPoint num="20" id="2628" />
-<TGConnectingPoint num="21" id="2629" />
-<TGConnectingPoint num="22" id="2630" />
-<TGConnectingPoint num="23" id="2631" />
+<TGConnectingPoint num="0" id="2605" />
+<TGConnectingPoint num="1" id="2606" />
+<TGConnectingPoint num="2" id="2607" />
+<TGConnectingPoint num="3" id="2608" />
+<TGConnectingPoint num="4" id="2609" />
+<TGConnectingPoint num="5" id="2610" />
+<TGConnectingPoint num="6" id="2611" />
+<TGConnectingPoint num="7" id="2612" />
+<TGConnectingPoint num="8" id="2613" />
+<TGConnectingPoint num="9" id="2614" />
+<TGConnectingPoint num="10" id="2615" />
+<TGConnectingPoint num="11" id="2616" />
+<TGConnectingPoint num="12" id="2617" />
+<TGConnectingPoint num="13" id="2618" />
+<TGConnectingPoint num="14" id="2619" />
+<TGConnectingPoint num="15" id="2620" />
+<TGConnectingPoint num="16" id="2621" />
+<TGConnectingPoint num="17" id="2622" />
+<TGConnectingPoint num="18" id="2623" />
+<TGConnectingPoint num="19" id="2624" />
+<TGConnectingPoint num="20" id="2625" />
+<TGConnectingPoint num="21" id="2626" />
+<TGConnectingPoint num="22" id="2627" />
+<TGConnectingPoint num="23" id="2628" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -4546,1628 +4547,1996 @@ CC is lost
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="OnBoardCommunication" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2639" >
+<CONNECTOR type="5102" id="2636" >
 <cdparam x="82" y="38" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2638" />
-<P1  x="68" y="42" id="2890" />
-<P2  x="88" y="61" id="2850" />
+<TGConnectingPoint num="0" id="2635" />
+<P1  x="68" y="42" id="3015" />
+<P2  x="88" y="61" id="2943" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2637" >
-<father id="2639" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2634" >
+<father id="2636" num="0" />
 <cdparam x="82" y="78" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2633" />
-<TGConnectingPoint num="1" id="2634" />
-<TGConnectingPoint num="2" id="2635" />
-<TGConnectingPoint num="3" id="2636" />
+<TGConnectingPoint num="0" id="2630" />
+<TGConnectingPoint num="1" id="2631" />
+<TGConnectingPoint num="2" id="2632" />
+<TGConnectingPoint num="3" id="2633" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2646" >
+<CONNECTOR type="5102" id="2643" >
 <cdparam x="88" y="111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2645" />
-<P1  x="88" y="111" id="2855" />
-<P2  x="88" y="133" id="2838" />
+<TGConnectingPoint num="0" id="2642" />
+<P1  x="88" y="111" id="2948" />
+<P2  x="88" y="133" id="2931" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2644" >
-<father id="2646" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2641" >
+<father id="2643" num="0" />
 <cdparam x="88" y="151" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2640" />
-<TGConnectingPoint num="1" id="2641" />
-<TGConnectingPoint num="2" id="2642" />
-<TGConnectingPoint num="3" id="2643" />
+<TGConnectingPoint num="0" id="2637" />
+<TGConnectingPoint num="1" id="2638" />
+<TGConnectingPoint num="2" id="2639" />
+<TGConnectingPoint num="3" id="2640" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2653" >
+<CONNECTOR type="5102" id="2650" >
 <cdparam x="88" y="163" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2652" />
-<P1  x="88" y="163" id="2839" />
-<P2  x="87" y="181" id="2827" />
+<TGConnectingPoint num="0" id="2649" />
+<P1  x="88" y="163" id="2932" />
+<P2  x="87" y="181" id="2920" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2651" >
-<father id="2653" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2648" >
+<father id="2650" num="0" />
 <cdparam x="88" y="203" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2647" />
-<TGConnectingPoint num="1" id="2648" />
-<TGConnectingPoint num="2" id="2649" />
-<TGConnectingPoint num="3" id="2650" />
+<TGConnectingPoint num="0" id="2644" />
+<TGConnectingPoint num="1" id="2645" />
+<TGConnectingPoint num="2" id="2646" />
+<TGConnectingPoint num="3" id="2647" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2660" >
+<CONNECTOR type="5102" id="2657" >
 <cdparam x="87" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2659" />
-<P1  x="87" y="211" id="2828" />
-<P2  x="87" y="232" id="2787" />
+<TGConnectingPoint num="0" id="2656" />
+<P1  x="87" y="211" id="2921" />
+<P2  x="87" y="232" id="2848" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2658" >
-<father id="2660" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2655" >
+<father id="2657" num="0" />
 <cdparam x="87" y="251" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2654" />
-<TGConnectingPoint num="1" id="2655" />
-<TGConnectingPoint num="2" id="2656" />
-<TGConnectingPoint num="3" id="2657" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
+<TGConnectingPoint num="2" id="2653" />
+<TGConnectingPoint num="3" id="2654" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2667" >
+<CONNECTOR type="5102" id="2664" >
 <cdparam x="304" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2666" />
-<P1  x="304" y="109" id="2751" />
-<P2  x="304" y="134" id="2734" />
+<TGConnectingPoint num="0" id="2663" />
+<P1  x="304" y="109" id="2780" />
+<P2  x="304" y="134" id="2763" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2665" >
-<father id="2667" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2662" >
+<father id="2664" num="0" />
 <cdparam x="304" y="149" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2661" />
-<TGConnectingPoint num="1" id="2662" />
-<TGConnectingPoint num="2" id="2663" />
-<TGConnectingPoint num="3" id="2664" />
+<TGConnectingPoint num="0" id="2658" />
+<TGConnectingPoint num="1" id="2659" />
+<TGConnectingPoint num="2" id="2660" />
+<TGConnectingPoint num="3" id="2661" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2674" >
+<CONNECTOR type="5102" id="2671" >
 <cdparam x="304" y="164" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2673" />
-<P1  x="304" y="164" id="2735" />
-<P2  x="304" y="188" id="2723" />
+<TGConnectingPoint num="0" id="2670" />
+<P1  x="304" y="164" id="2764" />
+<P2  x="304" y="188" id="2752" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2672" >
-<father id="2674" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2669" >
+<father id="2671" num="0" />
 <cdparam x="304" y="204" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2668" />
-<TGConnectingPoint num="1" id="2669" />
-<TGConnectingPoint num="2" id="2670" />
-<TGConnectingPoint num="3" id="2671" />
+<TGConnectingPoint num="0" id="2665" />
+<TGConnectingPoint num="1" id="2666" />
+<TGConnectingPoint num="2" id="2667" />
+<TGConnectingPoint num="3" id="2668" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2681" >
+<CONNECTOR type="5102" id="2678" >
 <cdparam x="304" y="218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2680" />
-<P1  x="304" y="218" id="2724" />
-<P2  x="304" y="241" id="2683" />
+<TGConnectingPoint num="0" id="2677" />
+<P1  x="304" y="218" id="2753" />
+<P2  x="304" y="241" id="2680" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2679" >
-<father id="2681" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2676" >
+<father id="2678" num="0" />
 <cdparam x="304" y="258" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2675" />
-<TGConnectingPoint num="1" id="2676" />
-<TGConnectingPoint num="2" id="2677" />
-<TGConnectingPoint num="3" id="2678" />
+<TGConnectingPoint num="0" id="2672" />
+<TGConnectingPoint num="1" id="2673" />
+<TGConnectingPoint num="2" id="2674" />
+<TGConnectingPoint num="3" id="2675" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2722" >
+<COMPONENT type="5106" id="2751" >
 <cdparam x="246" y="241" />
 <sizeparam width="117" height="47" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="CONNECTED" />
-<TGConnectingPoint num="0" id="2682" />
-<TGConnectingPoint num="1" id="2683" />
-<TGConnectingPoint num="2" id="2684" />
-<TGConnectingPoint num="3" id="2685" />
-<TGConnectingPoint num="4" id="2686" />
-<TGConnectingPoint num="5" id="2687" />
-<TGConnectingPoint num="6" id="2688" />
-<TGConnectingPoint num="7" id="2689" />
-<TGConnectingPoint num="8" id="2690" />
-<TGConnectingPoint num="9" id="2691" />
-<TGConnectingPoint num="10" id="2692" />
-<TGConnectingPoint num="11" id="2693" />
-<TGConnectingPoint num="12" id="2694" />
-<TGConnectingPoint num="13" id="2695" />
-<TGConnectingPoint num="14" id="2696" />
-<TGConnectingPoint num="15" id="2697" />
-<TGConnectingPoint num="16" id="2698" />
-<TGConnectingPoint num="17" id="2699" />
-<TGConnectingPoint num="18" id="2700" />
-<TGConnectingPoint num="19" id="2701" />
-<TGConnectingPoint num="20" id="2702" />
-<TGConnectingPoint num="21" id="2703" />
-<TGConnectingPoint num="22" id="2704" />
-<TGConnectingPoint num="23" id="2705" />
-<TGConnectingPoint num="24" id="2706" />
-<TGConnectingPoint num="25" id="2707" />
-<TGConnectingPoint num="26" id="2708" />
-<TGConnectingPoint num="27" id="2709" />
-<TGConnectingPoint num="28" id="2710" />
-<TGConnectingPoint num="29" id="2711" />
-<TGConnectingPoint num="30" id="2712" />
-<TGConnectingPoint num="31" id="2713" />
-<TGConnectingPoint num="32" id="2714" />
-<TGConnectingPoint num="33" id="2715" />
-<TGConnectingPoint num="34" id="2716" />
-<TGConnectingPoint num="35" id="2717" />
-<TGConnectingPoint num="36" id="2718" />
-<TGConnectingPoint num="37" id="2719" />
-<TGConnectingPoint num="38" id="2720" />
-<TGConnectingPoint num="39" id="2721" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2733" >
+<TGConnectingPoint num="0" id="2679" />
+<TGConnectingPoint num="1" id="2680" />
+<TGConnectingPoint num="2" id="2681" />
+<TGConnectingPoint num="3" id="2682" />
+<TGConnectingPoint num="4" id="2683" />
+<TGConnectingPoint num="5" id="2684" />
+<TGConnectingPoint num="6" id="2685" />
+<TGConnectingPoint num="7" id="2686" />
+<TGConnectingPoint num="8" id="2687" />
+<TGConnectingPoint num="9" id="2688" />
+<TGConnectingPoint num="10" id="2689" />
+<TGConnectingPoint num="11" id="2690" />
+<TGConnectingPoint num="12" id="2691" />
+<TGConnectingPoint num="13" id="2692" />
+<TGConnectingPoint num="14" id="2693" />
+<TGConnectingPoint num="15" id="2694" />
+<TGConnectingPoint num="16" id="2695" />
+<TGConnectingPoint num="17" id="2696" />
+<TGConnectingPoint num="18" id="2697" />
+<TGConnectingPoint num="19" id="2698" />
+<TGConnectingPoint num="20" id="2699" />
+<TGConnectingPoint num="21" id="2700" />
+<TGConnectingPoint num="22" id="2701" />
+<TGConnectingPoint num="23" id="2702" />
+<TGConnectingPoint num="24" id="2703" />
+<TGConnectingPoint num="25" id="2704" />
+<TGConnectingPoint num="26" id="2705" />
+<TGConnectingPoint num="27" id="2706" />
+<TGConnectingPoint num="28" id="2707" />
+<TGConnectingPoint num="29" id="2708" />
+<TGConnectingPoint num="30" id="2709" />
+<TGConnectingPoint num="31" id="2710" />
+<TGConnectingPoint num="32" id="2711" />
+<TGConnectingPoint num="33" id="2712" />
+<TGConnectingPoint num="34" id="2713" />
+<TGConnectingPoint num="35" id="2714" />
+<TGConnectingPoint num="36" id="2715" />
+<TGConnectingPoint num="37" id="2716" />
+<TGConnectingPoint num="38" id="2717" />
+<TGConnectingPoint num="39" id="2718" />
+<TGConnectingPoint num="40" id="2719" />
+<TGConnectingPoint num="41" id="2720" />
+<TGConnectingPoint num="42" id="2721" />
+<TGConnectingPoint num="43" id="2722" />
+<TGConnectingPoint num="44" id="2723" />
+<TGConnectingPoint num="45" id="2724" />
+<TGConnectingPoint num="46" id="2725" />
+<TGConnectingPoint num="47" id="2726" />
+<TGConnectingPoint num="48" id="2727" />
+<TGConnectingPoint num="49" id="2728" />
+<TGConnectingPoint num="50" id="2729" />
+<TGConnectingPoint num="51" id="2730" />
+<TGConnectingPoint num="52" id="2731" />
+<TGConnectingPoint num="53" id="2732" />
+<TGConnectingPoint num="54" id="2733" />
+<TGConnectingPoint num="55" id="2734" />
+<TGConnectingPoint num="56" id="2735" />
+<TGConnectingPoint num="57" id="2736" />
+<TGConnectingPoint num="58" id="2737" />
+<TGConnectingPoint num="59" id="2738" />
+<TGConnectingPoint num="60" id="2739" />
+<TGConnectingPoint num="61" id="2740" />
+<TGConnectingPoint num="62" id="2741" />
+<TGConnectingPoint num="63" id="2742" />
+<TGConnectingPoint num="64" id="2743" />
+<TGConnectingPoint num="65" id="2744" />
+<TGConnectingPoint num="66" id="2745" />
+<TGConnectingPoint num="67" id="2746" />
+<TGConnectingPoint num="68" id="2747" />
+<TGConnectingPoint num="69" id="2748" />
+<TGConnectingPoint num="70" id="2749" />
+<TGConnectingPoint num="71" id="2750" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="2762" >
 <cdparam x="267" y="193" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconconf()" />
-<TGConnectingPoint num="0" id="2723" />
-<TGConnectingPoint num="1" id="2724" />
-<TGConnectingPoint num="2" id="2725" />
-<TGConnectingPoint num="3" id="2726" />
-<TGConnectingPoint num="4" id="2727" />
-<TGConnectingPoint num="5" id="2728" />
-<TGConnectingPoint num="6" id="2729" />
-<TGConnectingPoint num="7" id="2730" />
-<TGConnectingPoint num="8" id="2731" />
-<TGConnectingPoint num="9" id="2732" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2744" >
+<TGConnectingPoint num="0" id="2752" />
+<TGConnectingPoint num="1" id="2753" />
+<TGConnectingPoint num="2" id="2754" />
+<TGConnectingPoint num="3" id="2755" />
+<TGConnectingPoint num="4" id="2756" />
+<TGConnectingPoint num="5" id="2757" />
+<TGConnectingPoint num="6" id="2758" />
+<TGConnectingPoint num="7" id="2759" />
+<TGConnectingPoint num="8" id="2760" />
+<TGConnectingPoint num="9" id="2761" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="2773" >
 <cdparam x="283" y="139" />
 <sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="CC()" />
-<TGConnectingPoint num="0" id="2734" />
-<TGConnectingPoint num="1" id="2735" />
-<TGConnectingPoint num="2" id="2736" />
-<TGConnectingPoint num="3" id="2737" />
-<TGConnectingPoint num="4" id="2738" />
-<TGConnectingPoint num="5" id="2739" />
-<TGConnectingPoint num="6" id="2740" />
-<TGConnectingPoint num="7" id="2741" />
-<TGConnectingPoint num="8" id="2742" />
-<TGConnectingPoint num="9" id="2743" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2785" >
+<TGConnectingPoint num="0" id="2763" />
+<TGConnectingPoint num="1" id="2764" />
+<TGConnectingPoint num="2" id="2765" />
+<TGConnectingPoint num="3" id="2766" />
+<TGConnectingPoint num="4" id="2767" />
+<TGConnectingPoint num="5" id="2768" />
+<TGConnectingPoint num="6" id="2769" />
+<TGConnectingPoint num="7" id="2770" />
+<TGConnectingPoint num="8" id="2771" />
+<TGConnectingPoint num="9" id="2772" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="2846" >
 <cdparam x="246" y="58" />
 <sizeparam width="117" height="51" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_CONF" />
-<TGConnectingPoint num="0" id="2745" />
-<TGConnectingPoint num="1" id="2746" />
-<TGConnectingPoint num="2" id="2747" />
-<TGConnectingPoint num="3" id="2748" />
-<TGConnectingPoint num="4" id="2749" />
-<TGConnectingPoint num="5" id="2750" />
-<TGConnectingPoint num="6" id="2751" />
-<TGConnectingPoint num="7" id="2752" />
-<TGConnectingPoint num="8" id="2753" />
-<TGConnectingPoint num="9" id="2754" />
-<TGConnectingPoint num="10" id="2755" />
-<TGConnectingPoint num="11" id="2756" />
-<TGConnectingPoint num="12" id="2757" />
-<TGConnectingPoint num="13" id="2758" />
-<TGConnectingPoint num="14" id="2759" />
-<TGConnectingPoint num="15" id="2760" />
-<TGConnectingPoint num="16" id="2761" />
-<TGConnectingPoint num="17" id="2762" />
-<TGConnectingPoint num="18" id="2763" />
-<TGConnectingPoint num="19" id="2764" />
-<TGConnectingPoint num="20" id="2765" />
-<TGConnectingPoint num="21" id="2766" />
-<TGConnectingPoint num="22" id="2767" />
-<TGConnectingPoint num="23" id="2768" />
-<TGConnectingPoint num="24" id="2769" />
-<TGConnectingPoint num="25" id="2770" />
-<TGConnectingPoint num="26" id="2771" />
-<TGConnectingPoint num="27" id="2772" />
-<TGConnectingPoint num="28" id="2773" />
-<TGConnectingPoint num="29" id="2774" />
-<TGConnectingPoint num="30" id="2775" />
-<TGConnectingPoint num="31" id="2776" />
-<TGConnectingPoint num="32" id="2777" />
-<TGConnectingPoint num="33" id="2778" />
-<TGConnectingPoint num="34" id="2779" />
-<TGConnectingPoint num="35" id="2780" />
-<TGConnectingPoint num="36" id="2781" />
-<TGConnectingPoint num="37" id="2782" />
-<TGConnectingPoint num="38" id="2783" />
-<TGConnectingPoint num="39" id="2784" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="2826" >
+<TGConnectingPoint num="0" id="2774" />
+<TGConnectingPoint num="1" id="2775" />
+<TGConnectingPoint num="2" id="2776" />
+<TGConnectingPoint num="3" id="2777" />
+<TGConnectingPoint num="4" id="2778" />
+<TGConnectingPoint num="5" id="2779" />
+<TGConnectingPoint num="6" id="2780" />
+<TGConnectingPoint num="7" id="2781" />
+<TGConnectingPoint num="8" id="2782" />
+<TGConnectingPoint num="9" id="2783" />
+<TGConnectingPoint num="10" id="2784" />
+<TGConnectingPoint num="11" id="2785" />
+<TGConnectingPoint num="12" id="2786" />
+<TGConnectingPoint num="13" id="2787" />
+<TGConnectingPoint num="14" id="2788" />
+<TGConnectingPoint num="15" id="2789" />
+<TGConnectingPoint num="16" id="2790" />
+<TGConnectingPoint num="17" id="2791" />
+<TGConnectingPoint num="18" id="2792" />
+<TGConnectingPoint num="19" id="2793" />
+<TGConnectingPoint num="20" id="2794" />
+<TGConnectingPoint num="21" id="2795" />
+<TGConnectingPoint num="22" id="2796" />
+<TGConnectingPoint num="23" id="2797" />
+<TGConnectingPoint num="24" id="2798" />
+<TGConnectingPoint num="25" id="2799" />
+<TGConnectingPoint num="26" id="2800" />
+<TGConnectingPoint num="27" id="2801" />
+<TGConnectingPoint num="28" id="2802" />
+<TGConnectingPoint num="29" id="2803" />
+<TGConnectingPoint num="30" id="2804" />
+<TGConnectingPoint num="31" id="2805" />
+<TGConnectingPoint num="32" id="2806" />
+<TGConnectingPoint num="33" id="2807" />
+<TGConnectingPoint num="34" id="2808" />
+<TGConnectingPoint num="35" id="2809" />
+<TGConnectingPoint num="36" id="2810" />
+<TGConnectingPoint num="37" id="2811" />
+<TGConnectingPoint num="38" id="2812" />
+<TGConnectingPoint num="39" id="2813" />
+<TGConnectingPoint num="40" id="2814" />
+<TGConnectingPoint num="41" id="2815" />
+<TGConnectingPoint num="42" id="2816" />
+<TGConnectingPoint num="43" id="2817" />
+<TGConnectingPoint num="44" id="2818" />
+<TGConnectingPoint num="45" id="2819" />
+<TGConnectingPoint num="46" id="2820" />
+<TGConnectingPoint num="47" id="2821" />
+<TGConnectingPoint num="48" id="2822" />
+<TGConnectingPoint num="49" id="2823" />
+<TGConnectingPoint num="50" id="2824" />
+<TGConnectingPoint num="51" id="2825" />
+<TGConnectingPoint num="52" id="2826" />
+<TGConnectingPoint num="53" id="2827" />
+<TGConnectingPoint num="54" id="2828" />
+<TGConnectingPoint num="55" id="2829" />
+<TGConnectingPoint num="56" id="2830" />
+<TGConnectingPoint num="57" id="2831" />
+<TGConnectingPoint num="58" id="2832" />
+<TGConnectingPoint num="59" id="2833" />
+<TGConnectingPoint num="60" id="2834" />
+<TGConnectingPoint num="61" id="2835" />
+<TGConnectingPoint num="62" id="2836" />
+<TGConnectingPoint num="63" id="2837" />
+<TGConnectingPoint num="64" id="2838" />
+<TGConnectingPoint num="65" id="2839" />
+<TGConnectingPoint num="66" id="2840" />
+<TGConnectingPoint num="67" id="2841" />
+<TGConnectingPoint num="68" id="2842" />
+<TGConnectingPoint num="69" id="2843" />
+<TGConnectingPoint num="70" id="2844" />
+<TGConnectingPoint num="71" id="2845" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="2919" >
 <cdparam x="19" y="232" />
 <sizeparam width="137" height="52" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_CONF" />
-<TGConnectingPoint num="0" id="2786" />
-<TGConnectingPoint num="1" id="2787" />
-<TGConnectingPoint num="2" id="2788" />
-<TGConnectingPoint num="3" id="2789" />
-<TGConnectingPoint num="4" id="2790" />
-<TGConnectingPoint num="5" id="2791" />
-<TGConnectingPoint num="6" id="2792" />
-<TGConnectingPoint num="7" id="2793" />
-<TGConnectingPoint num="8" id="2794" />
-<TGConnectingPoint num="9" id="2795" />
-<TGConnectingPoint num="10" id="2796" />
-<TGConnectingPoint num="11" id="2797" />
-<TGConnectingPoint num="12" id="2798" />
-<TGConnectingPoint num="13" id="2799" />
-<TGConnectingPoint num="14" id="2800" />
-<TGConnectingPoint num="15" id="2801" />
-<TGConnectingPoint num="16" id="2802" />
-<TGConnectingPoint num="17" id="2803" />
-<TGConnectingPoint num="18" id="2804" />
-<TGConnectingPoint num="19" id="2805" />
-<TGConnectingPoint num="20" id="2806" />
-<TGConnectingPoint num="21" id="2807" />
-<TGConnectingPoint num="22" id="2808" />
-<TGConnectingPoint num="23" id="2809" />
-<TGConnectingPoint num="24" id="2810" />
-<TGConnectingPoint num="25" id="2811" />
-<TGConnectingPoint num="26" id="2812" />
-<TGConnectingPoint num="27" id="2813" />
-<TGConnectingPoint num="28" id="2814" />
-<TGConnectingPoint num="29" id="2815" />
-<TGConnectingPoint num="30" id="2816" />
-<TGConnectingPoint num="31" id="2817" />
-<TGConnectingPoint num="32" id="2818" />
-<TGConnectingPoint num="33" id="2819" />
-<TGConnectingPoint num="34" id="2820" />
-<TGConnectingPoint num="35" id="2821" />
-<TGConnectingPoint num="36" id="2822" />
-<TGConnectingPoint num="37" id="2823" />
-<TGConnectingPoint num="38" id="2824" />
-<TGConnectingPoint num="39" id="2825" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2837" >
+<TGConnectingPoint num="0" id="2847" />
+<TGConnectingPoint num="1" id="2848" />
+<TGConnectingPoint num="2" id="2849" />
+<TGConnectingPoint num="3" id="2850" />
+<TGConnectingPoint num="4" id="2851" />
+<TGConnectingPoint num="5" id="2852" />
+<TGConnectingPoint num="6" id="2853" />
+<TGConnectingPoint num="7" id="2854" />
+<TGConnectingPoint num="8" id="2855" />
+<TGConnectingPoint num="9" id="2856" />
+<TGConnectingPoint num="10" id="2857" />
+<TGConnectingPoint num="11" id="2858" />
+<TGConnectingPoint num="12" id="2859" />
+<TGConnectingPoint num="13" id="2860" />
+<TGConnectingPoint num="14" id="2861" />
+<TGConnectingPoint num="15" id="2862" />
+<TGConnectingPoint num="16" id="2863" />
+<TGConnectingPoint num="17" id="2864" />
+<TGConnectingPoint num="18" id="2865" />
+<TGConnectingPoint num="19" id="2866" />
+<TGConnectingPoint num="20" id="2867" />
+<TGConnectingPoint num="21" id="2868" />
+<TGConnectingPoint num="22" id="2869" />
+<TGConnectingPoint num="23" id="2870" />
+<TGConnectingPoint num="24" id="2871" />
+<TGConnectingPoint num="25" id="2872" />
+<TGConnectingPoint num="26" id="2873" />
+<TGConnectingPoint num="27" id="2874" />
+<TGConnectingPoint num="28" id="2875" />
+<TGConnectingPoint num="29" id="2876" />
+<TGConnectingPoint num="30" id="2877" />
+<TGConnectingPoint num="31" id="2878" />
+<TGConnectingPoint num="32" id="2879" />
+<TGConnectingPoint num="33" id="2880" />
+<TGConnectingPoint num="34" id="2881" />
+<TGConnectingPoint num="35" id="2882" />
+<TGConnectingPoint num="36" id="2883" />
+<TGConnectingPoint num="37" id="2884" />
+<TGConnectingPoint num="38" id="2885" />
+<TGConnectingPoint num="39" id="2886" />
+<TGConnectingPoint num="40" id="2887" />
+<TGConnectingPoint num="41" id="2888" />
+<TGConnectingPoint num="42" id="2889" />
+<TGConnectingPoint num="43" id="2890" />
+<TGConnectingPoint num="44" id="2891" />
+<TGConnectingPoint num="45" id="2892" />
+<TGConnectingPoint num="46" id="2893" />
+<TGConnectingPoint num="47" id="2894" />
+<TGConnectingPoint num="48" id="2895" />
+<TGConnectingPoint num="49" id="2896" />
+<TGConnectingPoint num="50" id="2897" />
+<TGConnectingPoint num="51" id="2898" />
+<TGConnectingPoint num="52" id="2899" />
+<TGConnectingPoint num="53" id="2900" />
+<TGConnectingPoint num="54" id="2901" />
+<TGConnectingPoint num="55" id="2902" />
+<TGConnectingPoint num="56" id="2903" />
+<TGConnectingPoint num="57" id="2904" />
+<TGConnectingPoint num="58" id="2905" />
+<TGConnectingPoint num="59" id="2906" />
+<TGConnectingPoint num="60" id="2907" />
+<TGConnectingPoint num="61" id="2908" />
+<TGConnectingPoint num="62" id="2909" />
+<TGConnectingPoint num="63" id="2910" />
+<TGConnectingPoint num="64" id="2911" />
+<TGConnectingPoint num="65" id="2912" />
+<TGConnectingPoint num="66" id="2913" />
+<TGConnectingPoint num="67" id="2914" />
+<TGConnectingPoint num="68" id="2915" />
+<TGConnectingPoint num="69" id="2916" />
+<TGConnectingPoint num="70" id="2917" />
+<TGConnectingPoint num="71" id="2918" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="2930" >
 <cdparam x="70" y="186" />
 <sizeparam width="34" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="CR()" />
-<TGConnectingPoint num="0" id="2827" />
-<TGConnectingPoint num="1" id="2828" />
-<TGConnectingPoint num="2" id="2829" />
-<TGConnectingPoint num="3" id="2830" />
-<TGConnectingPoint num="4" id="2831" />
-<TGConnectingPoint num="5" id="2832" />
-<TGConnectingPoint num="6" id="2833" />
-<TGConnectingPoint num="7" id="2834" />
-<TGConnectingPoint num="8" id="2835" />
-<TGConnectingPoint num="9" id="2836" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="2848" >
+<TGConnectingPoint num="0" id="2920" />
+<TGConnectingPoint num="1" id="2921" />
+<TGConnectingPoint num="2" id="2922" />
+<TGConnectingPoint num="3" id="2923" />
+<TGConnectingPoint num="4" id="2924" />
+<TGConnectingPoint num="5" id="2925" />
+<TGConnectingPoint num="6" id="2926" />
+<TGConnectingPoint num="7" id="2927" />
+<TGConnectingPoint num="8" id="2928" />
+<TGConnectingPoint num="9" id="2929" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="2941" >
 <cdparam x="49" y="138" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconreq()" />
-<TGConnectingPoint num="0" id="2838" />
-<TGConnectingPoint num="1" id="2839" />
-<TGConnectingPoint num="2" id="2840" />
-<TGConnectingPoint num="3" id="2841" />
-<TGConnectingPoint num="4" id="2842" />
-<TGConnectingPoint num="5" id="2843" />
-<TGConnectingPoint num="6" id="2844" />
-<TGConnectingPoint num="7" id="2845" />
-<TGConnectingPoint num="8" id="2846" />
-<TGConnectingPoint num="9" id="2847" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2889" >
+<TGConnectingPoint num="0" id="2931" />
+<TGConnectingPoint num="1" id="2932" />
+<TGConnectingPoint num="2" id="2933" />
+<TGConnectingPoint num="3" id="2934" />
+<TGConnectingPoint num="4" id="2935" />
+<TGConnectingPoint num="5" id="2936" />
+<TGConnectingPoint num="6" id="2937" />
+<TGConnectingPoint num="7" id="2938" />
+<TGConnectingPoint num="8" id="2939" />
+<TGConnectingPoint num="9" id="2940" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3014" >
 <cdparam x="38" y="61" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="2849" />
-<TGConnectingPoint num="1" id="2850" />
-<TGConnectingPoint num="2" id="2851" />
-<TGConnectingPoint num="3" id="2852" />
-<TGConnectingPoint num="4" id="2853" />
-<TGConnectingPoint num="5" id="2854" />
-<TGConnectingPoint num="6" id="2855" />
-<TGConnectingPoint num="7" id="2856" />
-<TGConnectingPoint num="8" id="2857" />
-<TGConnectingPoint num="9" id="2858" />
-<TGConnectingPoint num="10" id="2859" />
-<TGConnectingPoint num="11" id="2860" />
-<TGConnectingPoint num="12" id="2861" />
-<TGConnectingPoint num="13" id="2862" />
-<TGConnectingPoint num="14" id="2863" />
-<TGConnectingPoint num="15" id="2864" />
-<TGConnectingPoint num="16" id="2865" />
-<TGConnectingPoint num="17" id="2866" />
-<TGConnectingPoint num="18" id="2867" />
-<TGConnectingPoint num="19" id="2868" />
-<TGConnectingPoint num="20" id="2869" />
-<TGConnectingPoint num="21" id="2870" />
-<TGConnectingPoint num="22" id="2871" />
-<TGConnectingPoint num="23" id="2872" />
-<TGConnectingPoint num="24" id="2873" />
-<TGConnectingPoint num="25" id="2874" />
-<TGConnectingPoint num="26" id="2875" />
-<TGConnectingPoint num="27" id="2876" />
-<TGConnectingPoint num="28" id="2877" />
-<TGConnectingPoint num="29" id="2878" />
-<TGConnectingPoint num="30" id="2879" />
-<TGConnectingPoint num="31" id="2880" />
-<TGConnectingPoint num="32" id="2881" />
-<TGConnectingPoint num="33" id="2882" />
-<TGConnectingPoint num="34" id="2883" />
-<TGConnectingPoint num="35" id="2884" />
-<TGConnectingPoint num="36" id="2885" />
-<TGConnectingPoint num="37" id="2886" />
-<TGConnectingPoint num="38" id="2887" />
-<TGConnectingPoint num="39" id="2888" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="2891" >
+<TGConnectingPoint num="0" id="2942" />
+<TGConnectingPoint num="1" id="2943" />
+<TGConnectingPoint num="2" id="2944" />
+<TGConnectingPoint num="3" id="2945" />
+<TGConnectingPoint num="4" id="2946" />
+<TGConnectingPoint num="5" id="2947" />
+<TGConnectingPoint num="6" id="2948" />
+<TGConnectingPoint num="7" id="2949" />
+<TGConnectingPoint num="8" id="2950" />
+<TGConnectingPoint num="9" id="2951" />
+<TGConnectingPoint num="10" id="2952" />
+<TGConnectingPoint num="11" id="2953" />
+<TGConnectingPoint num="12" id="2954" />
+<TGConnectingPoint num="13" id="2955" />
+<TGConnectingPoint num="14" id="2956" />
+<TGConnectingPoint num="15" id="2957" />
+<TGConnectingPoint num="16" id="2958" />
+<TGConnectingPoint num="17" id="2959" />
+<TGConnectingPoint num="18" id="2960" />
+<TGConnectingPoint num="19" id="2961" />
+<TGConnectingPoint num="20" id="2962" />
+<TGConnectingPoint num="21" id="2963" />
+<TGConnectingPoint num="22" id="2964" />
+<TGConnectingPoint num="23" id="2965" />
+<TGConnectingPoint num="24" id="2966" />
+<TGConnectingPoint num="25" id="2967" />
+<TGConnectingPoint num="26" id="2968" />
+<TGConnectingPoint num="27" id="2969" />
+<TGConnectingPoint num="28" id="2970" />
+<TGConnectingPoint num="29" id="2971" />
+<TGConnectingPoint num="30" id="2972" />
+<TGConnectingPoint num="31" id="2973" />
+<TGConnectingPoint num="32" id="2974" />
+<TGConnectingPoint num="33" id="2975" />
+<TGConnectingPoint num="34" id="2976" />
+<TGConnectingPoint num="35" id="2977" />
+<TGConnectingPoint num="36" id="2978" />
+<TGConnectingPoint num="37" id="2979" />
+<TGConnectingPoint num="38" id="2980" />
+<TGConnectingPoint num="39" id="2981" />
+<TGConnectingPoint num="40" id="2982" />
+<TGConnectingPoint num="41" id="2983" />
+<TGConnectingPoint num="42" id="2984" />
+<TGConnectingPoint num="43" id="2985" />
+<TGConnectingPoint num="44" id="2986" />
+<TGConnectingPoint num="45" id="2987" />
+<TGConnectingPoint num="46" id="2988" />
+<TGConnectingPoint num="47" id="2989" />
+<TGConnectingPoint num="48" id="2990" />
+<TGConnectingPoint num="49" id="2991" />
+<TGConnectingPoint num="50" id="2992" />
+<TGConnectingPoint num="51" id="2993" />
+<TGConnectingPoint num="52" id="2994" />
+<TGConnectingPoint num="53" id="2995" />
+<TGConnectingPoint num="54" id="2996" />
+<TGConnectingPoint num="55" id="2997" />
+<TGConnectingPoint num="56" id="2998" />
+<TGConnectingPoint num="57" id="2999" />
+<TGConnectingPoint num="58" id="3000" />
+<TGConnectingPoint num="59" id="3001" />
+<TGConnectingPoint num="60" id="3002" />
+<TGConnectingPoint num="61" id="3003" />
+<TGConnectingPoint num="62" id="3004" />
+<TGConnectingPoint num="63" id="3005" />
+<TGConnectingPoint num="64" id="3006" />
+<TGConnectingPoint num="65" id="3007" />
+<TGConnectingPoint num="66" id="3008" />
+<TGConnectingPoint num="67" id="3009" />
+<TGConnectingPoint num="68" id="3010" />
+<TGConnectingPoint num="69" id="3011" />
+<TGConnectingPoint num="70" id="3012" />
+<TGConnectingPoint num="71" id="3013" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3016" >
 <cdparam x="61" y="22" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2890" />
+<TGConnectingPoint num="0" id="3015" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="GroundCommunication" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="2898" >
+<CONNECTOR type="5102" id="3023" >
 <cdparam x="86" y="48" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2897" />
-<P1  x="86" y="48" id="3149" />
-<P2  x="87" y="72" id="3109" />
+<TGConnectingPoint num="0" id="3022" />
+<P1  x="86" y="48" id="3402" />
+<P2  x="87" y="72" id="3330" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2896" >
-<father id="2898" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3021" >
+<father id="3023" num="0" />
 <cdparam x="86" y="88" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2892" />
-<TGConnectingPoint num="1" id="2893" />
-<TGConnectingPoint num="2" id="2894" />
-<TGConnectingPoint num="3" id="2895" />
+<TGConnectingPoint num="0" id="3017" />
+<TGConnectingPoint num="1" id="3018" />
+<TGConnectingPoint num="2" id="3019" />
+<TGConnectingPoint num="3" id="3020" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2905" >
+<CONNECTOR type="5102" id="3030" >
 <cdparam x="99" y="122" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2904" />
-<P1  x="99" y="122" id="3138" />
-<P2  x="99" y="151" id="3097" />
+<TGConnectingPoint num="0" id="3029" />
+<P1  x="99" y="122" id="3359" />
+<P2  x="99" y="151" id="3318" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2903" >
-<father id="2905" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3028" >
+<father id="3030" num="0" />
 <cdparam x="99" y="162" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2899" />
-<TGConnectingPoint num="1" id="2900" />
-<TGConnectingPoint num="2" id="2901" />
-<TGConnectingPoint num="3" id="2902" />
+<TGConnectingPoint num="0" id="3024" />
+<TGConnectingPoint num="1" id="3025" />
+<TGConnectingPoint num="2" id="3026" />
+<TGConnectingPoint num="3" id="3027" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2912" >
+<CONNECTOR type="5102" id="3037" >
 <cdparam x="99" y="181" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2911" />
-<P1  x="99" y="181" id="3098" />
-<P2  x="99" y="207" id="3086" />
+<TGConnectingPoint num="0" id="3036" />
+<P1  x="99" y="181" id="3319" />
+<P2  x="99" y="207" id="3307" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2910" >
-<father id="2912" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3035" >
+<father id="3037" num="0" />
 <cdparam x="99" y="221" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2906" />
-<TGConnectingPoint num="1" id="2907" />
-<TGConnectingPoint num="2" id="2908" />
-<TGConnectingPoint num="3" id="2909" />
+<TGConnectingPoint num="0" id="3031" />
+<TGConnectingPoint num="1" id="3032" />
+<TGConnectingPoint num="2" id="3033" />
+<TGConnectingPoint num="3" id="3034" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2919" >
+<CONNECTOR type="5102" id="3044" >
 <cdparam x="99" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2918" />
-<P1  x="99" y="237" id="3087" />
-<P2  x="99" y="262" id="3046" />
+<TGConnectingPoint num="0" id="3043" />
+<P1  x="99" y="237" id="3308" />
+<P2  x="99" y="262" id="3235" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2917" >
-<father id="2919" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3042" >
+<father id="3044" num="0" />
 <cdparam x="99" y="277" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2913" />
-<TGConnectingPoint num="1" id="2914" />
-<TGConnectingPoint num="2" id="2915" />
-<TGConnectingPoint num="3" id="2916" />
+<TGConnectingPoint num="0" id="3038" />
+<TGConnectingPoint num="1" id="3039" />
+<TGConnectingPoint num="2" id="3040" />
+<TGConnectingPoint num="3" id="3041" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2926" >
+<CONNECTOR type="5102" id="3051" >
 <cdparam x="327" y="119" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="2925" />
-<P1  x="327" y="119" id="3034" />
-<P2  x="327" y="145" id="2993" />
+<TGConnectingPoint num="0" id="3050" />
+<P1  x="327" y="119" id="3191" />
+<P2  x="327" y="145" id="3150" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2924" >
-<father id="2926" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3049" >
+<father id="3051" num="0" />
 <cdparam x="327" y="159" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2920" />
-<TGConnectingPoint num="1" id="2921" />
-<TGConnectingPoint num="2" id="2922" />
-<TGConnectingPoint num="3" id="2923" />
+<TGConnectingPoint num="0" id="3045" />
+<TGConnectingPoint num="1" id="3046" />
+<TGConnectingPoint num="2" id="3047" />
+<TGConnectingPoint num="3" id="3048" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2933" >
+<CONNECTOR type="5102" id="3058" >
 <cdparam x="327" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2932" />
-<P1  x="327" y="175" id="2994" />
-<P2  x="327" y="204" id="2982" />
+<TGConnectingPoint num="0" id="3057" />
+<P1  x="327" y="175" id="3151" />
+<P2  x="327" y="204" id="3139" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2931" >
-<father id="2933" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3056" >
+<father id="3058" num="0" />
 <cdparam x="327" y="215" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2927" />
-<TGConnectingPoint num="1" id="2928" />
-<TGConnectingPoint num="2" id="2929" />
-<TGConnectingPoint num="3" id="2930" />
+<TGConnectingPoint num="0" id="3052" />
+<TGConnectingPoint num="1" id="3053" />
+<TGConnectingPoint num="2" id="3054" />
+<TGConnectingPoint num="3" id="3055" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2940" >
+<CONNECTOR type="5102" id="3065" >
 <cdparam x="327" y="234" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2939" />
-<P1  x="327" y="234" id="2983" />
-<P2  x="327" y="261" id="2942" />
+<TGConnectingPoint num="0" id="3064" />
+<P1  x="327" y="234" id="3140" />
+<P2  x="327" y="261" id="3067" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2938" >
-<father id="2940" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3063" >
+<father id="3065" num="0" />
 <cdparam x="327" y="274" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2934" />
-<TGConnectingPoint num="1" id="2935" />
-<TGConnectingPoint num="2" id="2936" />
-<TGConnectingPoint num="3" id="2937" />
+<TGConnectingPoint num="0" id="3059" />
+<TGConnectingPoint num="1" id="3060" />
+<TGConnectingPoint num="2" id="3061" />
+<TGConnectingPoint num="3" id="3062" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2981" >
+<COMPONENT type="5106" id="3138" >
 <cdparam x="277" y="261" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="2941" />
-<TGConnectingPoint num="1" id="2942" />
-<TGConnectingPoint num="2" id="2943" />
-<TGConnectingPoint num="3" id="2944" />
-<TGConnectingPoint num="4" id="2945" />
-<TGConnectingPoint num="5" id="2946" />
-<TGConnectingPoint num="6" id="2947" />
-<TGConnectingPoint num="7" id="2948" />
-<TGConnectingPoint num="8" id="2949" />
-<TGConnectingPoint num="9" id="2950" />
-<TGConnectingPoint num="10" id="2951" />
-<TGConnectingPoint num="11" id="2952" />
-<TGConnectingPoint num="12" id="2953" />
-<TGConnectingPoint num="13" id="2954" />
-<TGConnectingPoint num="14" id="2955" />
-<TGConnectingPoint num="15" id="2956" />
-<TGConnectingPoint num="16" id="2957" />
-<TGConnectingPoint num="17" id="2958" />
-<TGConnectingPoint num="18" id="2959" />
-<TGConnectingPoint num="19" id="2960" />
-<TGConnectingPoint num="20" id="2961" />
-<TGConnectingPoint num="21" id="2962" />
-<TGConnectingPoint num="22" id="2963" />
-<TGConnectingPoint num="23" id="2964" />
-<TGConnectingPoint num="24" id="2965" />
-<TGConnectingPoint num="25" id="2966" />
-<TGConnectingPoint num="26" id="2967" />
-<TGConnectingPoint num="27" id="2968" />
-<TGConnectingPoint num="28" id="2969" />
-<TGConnectingPoint num="29" id="2970" />
-<TGConnectingPoint num="30" id="2971" />
-<TGConnectingPoint num="31" id="2972" />
-<TGConnectingPoint num="32" id="2973" />
-<TGConnectingPoint num="33" id="2974" />
-<TGConnectingPoint num="34" id="2975" />
-<TGConnectingPoint num="35" id="2976" />
-<TGConnectingPoint num="36" id="2977" />
-<TGConnectingPoint num="37" id="2978" />
-<TGConnectingPoint num="38" id="2979" />
-<TGConnectingPoint num="39" id="2980" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="2992" >
+<TGConnectingPoint num="0" id="3066" />
+<TGConnectingPoint num="1" id="3067" />
+<TGConnectingPoint num="2" id="3068" />
+<TGConnectingPoint num="3" id="3069" />
+<TGConnectingPoint num="4" id="3070" />
+<TGConnectingPoint num="5" id="3071" />
+<TGConnectingPoint num="6" id="3072" />
+<TGConnectingPoint num="7" id="3073" />
+<TGConnectingPoint num="8" id="3074" />
+<TGConnectingPoint num="9" id="3075" />
+<TGConnectingPoint num="10" id="3076" />
+<TGConnectingPoint num="11" id="3077" />
+<TGConnectingPoint num="12" id="3078" />
+<TGConnectingPoint num="13" id="3079" />
+<TGConnectingPoint num="14" id="3080" />
+<TGConnectingPoint num="15" id="3081" />
+<TGConnectingPoint num="16" id="3082" />
+<TGConnectingPoint num="17" id="3083" />
+<TGConnectingPoint num="18" id="3084" />
+<TGConnectingPoint num="19" id="3085" />
+<TGConnectingPoint num="20" id="3086" />
+<TGConnectingPoint num="21" id="3087" />
+<TGConnectingPoint num="22" id="3088" />
+<TGConnectingPoint num="23" id="3089" />
+<TGConnectingPoint num="24" id="3090" />
+<TGConnectingPoint num="25" id="3091" />
+<TGConnectingPoint num="26" id="3092" />
+<TGConnectingPoint num="27" id="3093" />
+<TGConnectingPoint num="28" id="3094" />
+<TGConnectingPoint num="29" id="3095" />
+<TGConnectingPoint num="30" id="3096" />
+<TGConnectingPoint num="31" id="3097" />
+<TGConnectingPoint num="32" id="3098" />
+<TGConnectingPoint num="33" id="3099" />
+<TGConnectingPoint num="34" id="3100" />
+<TGConnectingPoint num="35" id="3101" />
+<TGConnectingPoint num="36" id="3102" />
+<TGConnectingPoint num="37" id="3103" />
+<TGConnectingPoint num="38" id="3104" />
+<TGConnectingPoint num="39" id="3105" />
+<TGConnectingPoint num="40" id="3106" />
+<TGConnectingPoint num="41" id="3107" />
+<TGConnectingPoint num="42" id="3108" />
+<TGConnectingPoint num="43" id="3109" />
+<TGConnectingPoint num="44" id="3110" />
+<TGConnectingPoint num="45" id="3111" />
+<TGConnectingPoint num="46" id="3112" />
+<TGConnectingPoint num="47" id="3113" />
+<TGConnectingPoint num="48" id="3114" />
+<TGConnectingPoint num="49" id="3115" />
+<TGConnectingPoint num="50" id="3116" />
+<TGConnectingPoint num="51" id="3117" />
+<TGConnectingPoint num="52" id="3118" />
+<TGConnectingPoint num="53" id="3119" />
+<TGConnectingPoint num="54" id="3120" />
+<TGConnectingPoint num="55" id="3121" />
+<TGConnectingPoint num="56" id="3122" />
+<TGConnectingPoint num="57" id="3123" />
+<TGConnectingPoint num="58" id="3124" />
+<TGConnectingPoint num="59" id="3125" />
+<TGConnectingPoint num="60" id="3126" />
+<TGConnectingPoint num="61" id="3127" />
+<TGConnectingPoint num="62" id="3128" />
+<TGConnectingPoint num="63" id="3129" />
+<TGConnectingPoint num="64" id="3130" />
+<TGConnectingPoint num="65" id="3131" />
+<TGConnectingPoint num="66" id="3132" />
+<TGConnectingPoint num="67" id="3133" />
+<TGConnectingPoint num="68" id="3134" />
+<TGConnectingPoint num="69" id="3135" />
+<TGConnectingPoint num="70" id="3136" />
+<TGConnectingPoint num="71" id="3137" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3149" >
 <cdparam x="310" y="209" />
 <sizeparam width="34" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="CC()" />
-<TGConnectingPoint num="0" id="2982" />
-<TGConnectingPoint num="1" id="2983" />
-<TGConnectingPoint num="2" id="2984" />
-<TGConnectingPoint num="3" id="2985" />
-<TGConnectingPoint num="4" id="2986" />
-<TGConnectingPoint num="5" id="2987" />
-<TGConnectingPoint num="6" id="2988" />
-<TGConnectingPoint num="7" id="2989" />
-<TGConnectingPoint num="8" id="2990" />
-<TGConnectingPoint num="9" id="2991" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3003" >
+<TGConnectingPoint num="0" id="3139" />
+<TGConnectingPoint num="1" id="3140" />
+<TGConnectingPoint num="2" id="3141" />
+<TGConnectingPoint num="3" id="3142" />
+<TGConnectingPoint num="4" id="3143" />
+<TGConnectingPoint num="5" id="3144" />
+<TGConnectingPoint num="6" id="3145" />
+<TGConnectingPoint num="7" id="3146" />
+<TGConnectingPoint num="8" id="3147" />
+<TGConnectingPoint num="9" id="3148" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3160" >
 <cdparam x="285" y="150" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconresp()" />
-<TGConnectingPoint num="0" id="2993" />
-<TGConnectingPoint num="1" id="2994" />
-<TGConnectingPoint num="2" id="2995" />
-<TGConnectingPoint num="3" id="2996" />
-<TGConnectingPoint num="4" id="2997" />
-<TGConnectingPoint num="5" id="2998" />
-<TGConnectingPoint num="6" id="2999" />
-<TGConnectingPoint num="7" id="3000" />
-<TGConnectingPoint num="8" id="3001" />
-<TGConnectingPoint num="9" id="3002" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3044" >
+<TGConnectingPoint num="0" id="3150" />
+<TGConnectingPoint num="1" id="3151" />
+<TGConnectingPoint num="2" id="3152" />
+<TGConnectingPoint num="3" id="3153" />
+<TGConnectingPoint num="4" id="3154" />
+<TGConnectingPoint num="5" id="3155" />
+<TGConnectingPoint num="6" id="3156" />
+<TGConnectingPoint num="7" id="3157" />
+<TGConnectingPoint num="8" id="3158" />
+<TGConnectingPoint num="9" id="3159" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3233" >
 <cdparam x="254" y="69" />
 <sizeparam width="119" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_RESP" />
-<TGConnectingPoint num="0" id="3004" />
-<TGConnectingPoint num="1" id="3005" />
-<TGConnectingPoint num="2" id="3006" />
-<TGConnectingPoint num="3" id="3007" />
-<TGConnectingPoint num="4" id="3008" />
-<TGConnectingPoint num="5" id="3009" />
-<TGConnectingPoint num="6" id="3010" />
-<TGConnectingPoint num="7" id="3011" />
-<TGConnectingPoint num="8" id="3012" />
-<TGConnectingPoint num="9" id="3013" />
-<TGConnectingPoint num="10" id="3014" />
-<TGConnectingPoint num="11" id="3015" />
-<TGConnectingPoint num="12" id="3016" />
-<TGConnectingPoint num="13" id="3017" />
-<TGConnectingPoint num="14" id="3018" />
-<TGConnectingPoint num="15" id="3019" />
-<TGConnectingPoint num="16" id="3020" />
-<TGConnectingPoint num="17" id="3021" />
-<TGConnectingPoint num="18" id="3022" />
-<TGConnectingPoint num="19" id="3023" />
-<TGConnectingPoint num="20" id="3024" />
-<TGConnectingPoint num="21" id="3025" />
-<TGConnectingPoint num="22" id="3026" />
-<TGConnectingPoint num="23" id="3027" />
-<TGConnectingPoint num="24" id="3028" />
-<TGConnectingPoint num="25" id="3029" />
-<TGConnectingPoint num="26" id="3030" />
-<TGConnectingPoint num="27" id="3031" />
-<TGConnectingPoint num="28" id="3032" />
-<TGConnectingPoint num="29" id="3033" />
-<TGConnectingPoint num="30" id="3034" />
-<TGConnectingPoint num="31" id="3035" />
-<TGConnectingPoint num="32" id="3036" />
-<TGConnectingPoint num="33" id="3037" />
-<TGConnectingPoint num="34" id="3038" />
-<TGConnectingPoint num="35" id="3039" />
-<TGConnectingPoint num="36" id="3040" />
-<TGConnectingPoint num="37" id="3041" />
-<TGConnectingPoint num="38" id="3042" />
-<TGConnectingPoint num="39" id="3043" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3085" >
+<TGConnectingPoint num="0" id="3161" />
+<TGConnectingPoint num="1" id="3162" />
+<TGConnectingPoint num="2" id="3163" />
+<TGConnectingPoint num="3" id="3164" />
+<TGConnectingPoint num="4" id="3165" />
+<TGConnectingPoint num="5" id="3166" />
+<TGConnectingPoint num="6" id="3167" />
+<TGConnectingPoint num="7" id="3168" />
+<TGConnectingPoint num="8" id="3169" />
+<TGConnectingPoint num="9" id="3170" />
+<TGConnectingPoint num="10" id="3171" />
+<TGConnectingPoint num="11" id="3172" />
+<TGConnectingPoint num="12" id="3173" />
+<TGConnectingPoint num="13" id="3174" />
+<TGConnectingPoint num="14" id="3175" />
+<TGConnectingPoint num="15" id="3176" />
+<TGConnectingPoint num="16" id="3177" />
+<TGConnectingPoint num="17" id="3178" />
+<TGConnectingPoint num="18" id="3179" />
+<TGConnectingPoint num="19" id="3180" />
+<TGConnectingPoint num="20" id="3181" />
+<TGConnectingPoint num="21" id="3182" />
+<TGConnectingPoint num="22" id="3183" />
+<TGConnectingPoint num="23" id="3184" />
+<TGConnectingPoint num="24" id="3185" />
+<TGConnectingPoint num="25" id="3186" />
+<TGConnectingPoint num="26" id="3187" />
+<TGConnectingPoint num="27" id="3188" />
+<TGConnectingPoint num="28" id="3189" />
+<TGConnectingPoint num="29" id="3190" />
+<TGConnectingPoint num="30" id="3191" />
+<TGConnectingPoint num="31" id="3192" />
+<TGConnectingPoint num="32" id="3193" />
+<TGConnectingPoint num="33" id="3194" />
+<TGConnectingPoint num="34" id="3195" />
+<TGConnectingPoint num="35" id="3196" />
+<TGConnectingPoint num="36" id="3197" />
+<TGConnectingPoint num="37" id="3198" />
+<TGConnectingPoint num="38" id="3199" />
+<TGConnectingPoint num="39" id="3200" />
+<TGConnectingPoint num="40" id="3201" />
+<TGConnectingPoint num="41" id="3202" />
+<TGConnectingPoint num="42" id="3203" />
+<TGConnectingPoint num="43" id="3204" />
+<TGConnectingPoint num="44" id="3205" />
+<TGConnectingPoint num="45" id="3206" />
+<TGConnectingPoint num="46" id="3207" />
+<TGConnectingPoint num="47" id="3208" />
+<TGConnectingPoint num="48" id="3209" />
+<TGConnectingPoint num="49" id="3210" />
+<TGConnectingPoint num="50" id="3211" />
+<TGConnectingPoint num="51" id="3212" />
+<TGConnectingPoint num="52" id="3213" />
+<TGConnectingPoint num="53" id="3214" />
+<TGConnectingPoint num="54" id="3215" />
+<TGConnectingPoint num="55" id="3216" />
+<TGConnectingPoint num="56" id="3217" />
+<TGConnectingPoint num="57" id="3218" />
+<TGConnectingPoint num="58" id="3219" />
+<TGConnectingPoint num="59" id="3220" />
+<TGConnectingPoint num="60" id="3221" />
+<TGConnectingPoint num="61" id="3222" />
+<TGConnectingPoint num="62" id="3223" />
+<TGConnectingPoint num="63" id="3224" />
+<TGConnectingPoint num="64" id="3225" />
+<TGConnectingPoint num="65" id="3226" />
+<TGConnectingPoint num="66" id="3227" />
+<TGConnectingPoint num="67" id="3228" />
+<TGConnectingPoint num="68" id="3229" />
+<TGConnectingPoint num="69" id="3230" />
+<TGConnectingPoint num="70" id="3231" />
+<TGConnectingPoint num="71" id="3232" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="3306" >
 <cdparam x="39" y="262" />
 <sizeparam width="121" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_RESP" />
-<TGConnectingPoint num="0" id="3045" />
-<TGConnectingPoint num="1" id="3046" />
-<TGConnectingPoint num="2" id="3047" />
-<TGConnectingPoint num="3" id="3048" />
-<TGConnectingPoint num="4" id="3049" />
-<TGConnectingPoint num="5" id="3050" />
-<TGConnectingPoint num="6" id="3051" />
-<TGConnectingPoint num="7" id="3052" />
-<TGConnectingPoint num="8" id="3053" />
-<TGConnectingPoint num="9" id="3054" />
-<TGConnectingPoint num="10" id="3055" />
-<TGConnectingPoint num="11" id="3056" />
-<TGConnectingPoint num="12" id="3057" />
-<TGConnectingPoint num="13" id="3058" />
-<TGConnectingPoint num="14" id="3059" />
-<TGConnectingPoint num="15" id="3060" />
-<TGConnectingPoint num="16" id="3061" />
-<TGConnectingPoint num="17" id="3062" />
-<TGConnectingPoint num="18" id="3063" />
-<TGConnectingPoint num="19" id="3064" />
-<TGConnectingPoint num="20" id="3065" />
-<TGConnectingPoint num="21" id="3066" />
-<TGConnectingPoint num="22" id="3067" />
-<TGConnectingPoint num="23" id="3068" />
-<TGConnectingPoint num="24" id="3069" />
-<TGConnectingPoint num="25" id="3070" />
-<TGConnectingPoint num="26" id="3071" />
-<TGConnectingPoint num="27" id="3072" />
-<TGConnectingPoint num="28" id="3073" />
-<TGConnectingPoint num="29" id="3074" />
-<TGConnectingPoint num="30" id="3075" />
-<TGConnectingPoint num="31" id="3076" />
-<TGConnectingPoint num="32" id="3077" />
-<TGConnectingPoint num="33" id="3078" />
-<TGConnectingPoint num="34" id="3079" />
-<TGConnectingPoint num="35" id="3080" />
-<TGConnectingPoint num="36" id="3081" />
-<TGConnectingPoint num="37" id="3082" />
-<TGConnectingPoint num="38" id="3083" />
-<TGConnectingPoint num="39" id="3084" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3096" >
+<TGConnectingPoint num="0" id="3234" />
+<TGConnectingPoint num="1" id="3235" />
+<TGConnectingPoint num="2" id="3236" />
+<TGConnectingPoint num="3" id="3237" />
+<TGConnectingPoint num="4" id="3238" />
+<TGConnectingPoint num="5" id="3239" />
+<TGConnectingPoint num="6" id="3240" />
+<TGConnectingPoint num="7" id="3241" />
+<TGConnectingPoint num="8" id="3242" />
+<TGConnectingPoint num="9" id="3243" />
+<TGConnectingPoint num="10" id="3244" />
+<TGConnectingPoint num="11" id="3245" />
+<TGConnectingPoint num="12" id="3246" />
+<TGConnectingPoint num="13" id="3247" />
+<TGConnectingPoint num="14" id="3248" />
+<TGConnectingPoint num="15" id="3249" />
+<TGConnectingPoint num="16" id="3250" />
+<TGConnectingPoint num="17" id="3251" />
+<TGConnectingPoint num="18" id="3252" />
+<TGConnectingPoint num="19" id="3253" />
+<TGConnectingPoint num="20" id="3254" />
+<TGConnectingPoint num="21" id="3255" />
+<TGConnectingPoint num="22" id="3256" />
+<TGConnectingPoint num="23" id="3257" />
+<TGConnectingPoint num="24" id="3258" />
+<TGConnectingPoint num="25" id="3259" />
+<TGConnectingPoint num="26" id="3260" />
+<TGConnectingPoint num="27" id="3261" />
+<TGConnectingPoint num="28" id="3262" />
+<TGConnectingPoint num="29" id="3263" />
+<TGConnectingPoint num="30" id="3264" />
+<TGConnectingPoint num="31" id="3265" />
+<TGConnectingPoint num="32" id="3266" />
+<TGConnectingPoint num="33" id="3267" />
+<TGConnectingPoint num="34" id="3268" />
+<TGConnectingPoint num="35" id="3269" />
+<TGConnectingPoint num="36" id="3270" />
+<TGConnectingPoint num="37" id="3271" />
+<TGConnectingPoint num="38" id="3272" />
+<TGConnectingPoint num="39" id="3273" />
+<TGConnectingPoint num="40" id="3274" />
+<TGConnectingPoint num="41" id="3275" />
+<TGConnectingPoint num="42" id="3276" />
+<TGConnectingPoint num="43" id="3277" />
+<TGConnectingPoint num="44" id="3278" />
+<TGConnectingPoint num="45" id="3279" />
+<TGConnectingPoint num="46" id="3280" />
+<TGConnectingPoint num="47" id="3281" />
+<TGConnectingPoint num="48" id="3282" />
+<TGConnectingPoint num="49" id="3283" />
+<TGConnectingPoint num="50" id="3284" />
+<TGConnectingPoint num="51" id="3285" />
+<TGConnectingPoint num="52" id="3286" />
+<TGConnectingPoint num="53" id="3287" />
+<TGConnectingPoint num="54" id="3288" />
+<TGConnectingPoint num="55" id="3289" />
+<TGConnectingPoint num="56" id="3290" />
+<TGConnectingPoint num="57" id="3291" />
+<TGConnectingPoint num="58" id="3292" />
+<TGConnectingPoint num="59" id="3293" />
+<TGConnectingPoint num="60" id="3294" />
+<TGConnectingPoint num="61" id="3295" />
+<TGConnectingPoint num="62" id="3296" />
+<TGConnectingPoint num="63" id="3297" />
+<TGConnectingPoint num="64" id="3298" />
+<TGConnectingPoint num="65" id="3299" />
+<TGConnectingPoint num="66" id="3300" />
+<TGConnectingPoint num="67" id="3301" />
+<TGConnectingPoint num="68" id="3302" />
+<TGConnectingPoint num="69" id="3303" />
+<TGConnectingPoint num="70" id="3304" />
+<TGConnectingPoint num="71" id="3305" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="3317" >
 <cdparam x="65" y="212" />
 <sizeparam width="68" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconind()" />
-<TGConnectingPoint num="0" id="3086" />
-<TGConnectingPoint num="1" id="3087" />
-<TGConnectingPoint num="2" id="3088" />
-<TGConnectingPoint num="3" id="3089" />
-<TGConnectingPoint num="4" id="3090" />
-<TGConnectingPoint num="5" id="3091" />
-<TGConnectingPoint num="6" id="3092" />
-<TGConnectingPoint num="7" id="3093" />
-<TGConnectingPoint num="8" id="3094" />
-<TGConnectingPoint num="9" id="3095" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3107" >
+<TGConnectingPoint num="0" id="3307" />
+<TGConnectingPoint num="1" id="3308" />
+<TGConnectingPoint num="2" id="3309" />
+<TGConnectingPoint num="3" id="3310" />
+<TGConnectingPoint num="4" id="3311" />
+<TGConnectingPoint num="5" id="3312" />
+<TGConnectingPoint num="6" id="3313" />
+<TGConnectingPoint num="7" id="3314" />
+<TGConnectingPoint num="8" id="3315" />
+<TGConnectingPoint num="9" id="3316" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3328" >
 <cdparam x="78" y="156" />
 <sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="CR()" />
-<TGConnectingPoint num="0" id="3097" />
-<TGConnectingPoint num="1" id="3098" />
-<TGConnectingPoint num="2" id="3099" />
-<TGConnectingPoint num="3" id="3100" />
-<TGConnectingPoint num="4" id="3101" />
-<TGConnectingPoint num="5" id="3102" />
-<TGConnectingPoint num="6" id="3103" />
-<TGConnectingPoint num="7" id="3104" />
-<TGConnectingPoint num="8" id="3105" />
-<TGConnectingPoint num="9" id="3106" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3148" >
+<TGConnectingPoint num="0" id="3318" />
+<TGConnectingPoint num="1" id="3319" />
+<TGConnectingPoint num="2" id="3320" />
+<TGConnectingPoint num="3" id="3321" />
+<TGConnectingPoint num="4" id="3322" />
+<TGConnectingPoint num="5" id="3323" />
+<TGConnectingPoint num="6" id="3324" />
+<TGConnectingPoint num="7" id="3325" />
+<TGConnectingPoint num="8" id="3326" />
+<TGConnectingPoint num="9" id="3327" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3401" >
 <cdparam x="37" y="72" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="3108" />
-<TGConnectingPoint num="1" id="3109" />
-<TGConnectingPoint num="2" id="3110" />
-<TGConnectingPoint num="3" id="3111" />
-<TGConnectingPoint num="4" id="3112" />
-<TGConnectingPoint num="5" id="3113" />
-<TGConnectingPoint num="6" id="3114" />
-<TGConnectingPoint num="7" id="3115" />
-<TGConnectingPoint num="8" id="3116" />
-<TGConnectingPoint num="9" id="3117" />
-<TGConnectingPoint num="10" id="3118" />
-<TGConnectingPoint num="11" id="3119" />
-<TGConnectingPoint num="12" id="3120" />
-<TGConnectingPoint num="13" id="3121" />
-<TGConnectingPoint num="14" id="3122" />
-<TGConnectingPoint num="15" id="3123" />
-<TGConnectingPoint num="16" id="3124" />
-<TGConnectingPoint num="17" id="3125" />
-<TGConnectingPoint num="18" id="3126" />
-<TGConnectingPoint num="19" id="3127" />
-<TGConnectingPoint num="20" id="3128" />
-<TGConnectingPoint num="21" id="3129" />
-<TGConnectingPoint num="22" id="3130" />
-<TGConnectingPoint num="23" id="3131" />
-<TGConnectingPoint num="24" id="3132" />
-<TGConnectingPoint num="25" id="3133" />
-<TGConnectingPoint num="26" id="3134" />
-<TGConnectingPoint num="27" id="3135" />
-<TGConnectingPoint num="28" id="3136" />
-<TGConnectingPoint num="29" id="3137" />
-<TGConnectingPoint num="30" id="3138" />
-<TGConnectingPoint num="31" id="3139" />
-<TGConnectingPoint num="32" id="3140" />
-<TGConnectingPoint num="33" id="3141" />
-<TGConnectingPoint num="34" id="3142" />
-<TGConnectingPoint num="35" id="3143" />
-<TGConnectingPoint num="36" id="3144" />
-<TGConnectingPoint num="37" id="3145" />
-<TGConnectingPoint num="38" id="3146" />
-<TGConnectingPoint num="39" id="3147" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3150" >
+<TGConnectingPoint num="0" id="3329" />
+<TGConnectingPoint num="1" id="3330" />
+<TGConnectingPoint num="2" id="3331" />
+<TGConnectingPoint num="3" id="3332" />
+<TGConnectingPoint num="4" id="3333" />
+<TGConnectingPoint num="5" id="3334" />
+<TGConnectingPoint num="6" id="3335" />
+<TGConnectingPoint num="7" id="3336" />
+<TGConnectingPoint num="8" id="3337" />
+<TGConnectingPoint num="9" id="3338" />
+<TGConnectingPoint num="10" id="3339" />
+<TGConnectingPoint num="11" id="3340" />
+<TGConnectingPoint num="12" id="3341" />
+<TGConnectingPoint num="13" id="3342" />
+<TGConnectingPoint num="14" id="3343" />
+<TGConnectingPoint num="15" id="3344" />
+<TGConnectingPoint num="16" id="3345" />
+<TGConnectingPoint num="17" id="3346" />
+<TGConnectingPoint num="18" id="3347" />
+<TGConnectingPoint num="19" id="3348" />
+<TGConnectingPoint num="20" id="3349" />
+<TGConnectingPoint num="21" id="3350" />
+<TGConnectingPoint num="22" id="3351" />
+<TGConnectingPoint num="23" id="3352" />
+<TGConnectingPoint num="24" id="3353" />
+<TGConnectingPoint num="25" id="3354" />
+<TGConnectingPoint num="26" id="3355" />
+<TGConnectingPoint num="27" id="3356" />
+<TGConnectingPoint num="28" id="3357" />
+<TGConnectingPoint num="29" id="3358" />
+<TGConnectingPoint num="30" id="3359" />
+<TGConnectingPoint num="31" id="3360" />
+<TGConnectingPoint num="32" id="3361" />
+<TGConnectingPoint num="33" id="3362" />
+<TGConnectingPoint num="34" id="3363" />
+<TGConnectingPoint num="35" id="3364" />
+<TGConnectingPoint num="36" id="3365" />
+<TGConnectingPoint num="37" id="3366" />
+<TGConnectingPoint num="38" id="3367" />
+<TGConnectingPoint num="39" id="3368" />
+<TGConnectingPoint num="40" id="3369" />
+<TGConnectingPoint num="41" id="3370" />
+<TGConnectingPoint num="42" id="3371" />
+<TGConnectingPoint num="43" id="3372" />
+<TGConnectingPoint num="44" id="3373" />
+<TGConnectingPoint num="45" id="3374" />
+<TGConnectingPoint num="46" id="3375" />
+<TGConnectingPoint num="47" id="3376" />
+<TGConnectingPoint num="48" id="3377" />
+<TGConnectingPoint num="49" id="3378" />
+<TGConnectingPoint num="50" id="3379" />
+<TGConnectingPoint num="51" id="3380" />
+<TGConnectingPoint num="52" id="3381" />
+<TGConnectingPoint num="53" id="3382" />
+<TGConnectingPoint num="54" id="3383" />
+<TGConnectingPoint num="55" id="3384" />
+<TGConnectingPoint num="56" id="3385" />
+<TGConnectingPoint num="57" id="3386" />
+<TGConnectingPoint num="58" id="3387" />
+<TGConnectingPoint num="59" id="3388" />
+<TGConnectingPoint num="60" id="3389" />
+<TGConnectingPoint num="61" id="3390" />
+<TGConnectingPoint num="62" id="3391" />
+<TGConnectingPoint num="63" id="3392" />
+<TGConnectingPoint num="64" id="3393" />
+<TGConnectingPoint num="65" id="3394" />
+<TGConnectingPoint num="66" id="3395" />
+<TGConnectingPoint num="67" id="3396" />
+<TGConnectingPoint num="68" id="3397" />
+<TGConnectingPoint num="69" id="3398" />
+<TGConnectingPoint num="70" id="3399" />
+<TGConnectingPoint num="71" id="3400" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3403" >
 <cdparam x="79" y="28" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3149" />
+<TGConnectingPoint num="0" id="3402" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3163" >
+<CONNECTOR type="5102" id="3416" >
 <cdparam x="153" y="198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3159" />
-<TGConnectingPoint num="1" id="3160" />
-<TGConnectingPoint num="2" id="3161" />
-<TGConnectingPoint num="3" id="3162" />
-<P1  x="153" y="198" id="3210" />
-<P2  x="261" y="114" id="3243" />
+<TGConnectingPoint num="0" id="3412" />
+<TGConnectingPoint num="1" id="3413" />
+<TGConnectingPoint num="2" id="3414" />
+<TGConnectingPoint num="3" id="3415" />
+<P1  x="153" y="198" id="3463" />
+<P2  x="261" y="114" id="3496" />
 <Point x="153" y="216" />
 <Point x="309" y="216" />
 <Point x="309" y="114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3151" >
-<father id="3163" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3404" >
+<father id="3416" num="0" />
 <cdparam x="153" y="216" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3152" >
-<father id="3163" num="1" />
+<SUBCOMPONENT type="-1" id="3405" >
+<father id="3416" num="1" />
 <cdparam x="309" y="216" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3153" >
-<father id="3163" num="2" />
+<SUBCOMPONENT type="-1" id="3406" >
+<father id="3416" num="2" />
 <cdparam x="309" y="114" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3158" >
-<father id="3163" num="3" />
+<SUBCOMPONENT type="-1" id="3411" >
+<father id="3416" num="3" />
 <cdparam x="153" y="238" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3154" />
-<TGConnectingPoint num="1" id="3155" />
-<TGConnectingPoint num="2" id="3156" />
-<TGConnectingPoint num="3" id="3157" />
+<TGConnectingPoint num="0" id="3407" />
+<TGConnectingPoint num="1" id="3408" />
+<TGConnectingPoint num="2" id="3409" />
+<TGConnectingPoint num="3" id="3410" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3176" >
+<CONNECTOR type="5102" id="3429" >
 <cdparam x="247" y="197" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3172" />
-<TGConnectingPoint num="1" id="3173" />
-<TGConnectingPoint num="2" id="3174" />
-<TGConnectingPoint num="3" id="3175" />
-<P1  x="247" y="197" id="3199" />
-<P2  x="261" y="133" id="3233" />
+<TGConnectingPoint num="0" id="3425" />
+<TGConnectingPoint num="1" id="3426" />
+<TGConnectingPoint num="2" id="3427" />
+<TGConnectingPoint num="3" id="3428" />
+<P1  x="247" y="197" id="3452" />
+<P2  x="261" y="133" id="3486" />
 <Point x="247" y="207" />
 <Point x="298" y="207" />
 <Point x="298" y="133" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3164" >
-<father id="3176" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3417" >
+<father id="3429" num="0" />
 <cdparam x="247" y="207" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3165" >
-<father id="3176" num="1" />
+<SUBCOMPONENT type="-1" id="3418" >
+<father id="3429" num="1" />
 <cdparam x="298" y="207" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3166" >
-<father id="3176" num="2" />
+<SUBCOMPONENT type="-1" id="3419" >
+<father id="3429" num="2" />
 <cdparam x="298" y="133" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3171" >
-<father id="3176" num="3" />
+<SUBCOMPONENT type="-1" id="3424" >
+<father id="3429" num="3" />
 <cdparam x="247" y="237" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3167" />
-<TGConnectingPoint num="1" id="3168" />
-<TGConnectingPoint num="2" id="3169" />
-<TGConnectingPoint num="3" id="3170" />
+<TGConnectingPoint num="0" id="3420" />
+<TGConnectingPoint num="1" id="3421" />
+<TGConnectingPoint num="2" id="3422" />
+<TGConnectingPoint num="3" id="3423" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3183" >
+<CONNECTOR type="5102" id="3436" >
 <cdparam x="186" y="62" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3182" />
-<P1  x="186" y="62" id="3261" />
-<P2  x="211" y="96" id="3221" />
+<TGConnectingPoint num="0" id="3435" />
+<P1  x="186" y="62" id="3546" />
+<P2  x="211" y="96" id="3474" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3181" >
-<father id="3183" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3434" >
+<father id="3436" num="0" />
 <cdparam x="211" y="104" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3177" />
-<TGConnectingPoint num="1" id="3178" />
-<TGConnectingPoint num="2" id="3179" />
-<TGConnectingPoint num="3" id="3180" />
+<TGConnectingPoint num="0" id="3430" />
+<TGConnectingPoint num="1" id="3431" />
+<TGConnectingPoint num="2" id="3432" />
+<TGConnectingPoint num="3" id="3433" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3190" >
+<CONNECTOR type="5102" id="3443" >
 <cdparam x="161" y="146" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3189" />
-<P1  x="186" y="146" id="3234" />
-<P2  x="153" y="168" id="3209" />
+<TGConnectingPoint num="0" id="3442" />
+<P1  x="186" y="146" id="3487" />
+<P2  x="153" y="168" id="3462" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3188" >
-<father id="3190" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3441" >
+<father id="3443" num="0" />
 <cdparam x="161" y="186" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3184" />
-<TGConnectingPoint num="1" id="3185" />
-<TGConnectingPoint num="2" id="3186" />
-<TGConnectingPoint num="3" id="3187" />
+<TGConnectingPoint num="0" id="3437" />
+<TGConnectingPoint num="1" id="3438" />
+<TGConnectingPoint num="2" id="3439" />
+<TGConnectingPoint num="3" id="3440" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3197" >
+<CONNECTOR type="5102" id="3450" >
 <cdparam x="211" y="201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3196" />
-<P1  x="236" y="146" id="3235" />
-<P2  x="247" y="167" id="3198" />
+<TGConnectingPoint num="0" id="3449" />
+<P1  x="236" y="146" id="3488" />
+<P2  x="247" y="167" id="3451" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3195" >
-<father id="3197" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3448" >
+<father id="3450" num="0" />
 <cdparam x="211" y="241" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3191" />
-<TGConnectingPoint num="1" id="3192" />
-<TGConnectingPoint num="2" id="3193" />
-<TGConnectingPoint num="3" id="3194" />
+<TGConnectingPoint num="0" id="3444" />
+<TGConnectingPoint num="1" id="3445" />
+<TGConnectingPoint num="2" id="3446" />
+<TGConnectingPoint num="3" id="3447" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3208" >
+<COMPONENT type="5103" id="3461" >
 <cdparam x="209" y="172" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconresp()" />
-<TGConnectingPoint num="0" id="3198" />
-<TGConnectingPoint num="1" id="3199" />
-<TGConnectingPoint num="2" id="3200" />
-<TGConnectingPoint num="3" id="3201" />
-<TGConnectingPoint num="4" id="3202" />
-<TGConnectingPoint num="5" id="3203" />
-<TGConnectingPoint num="6" id="3204" />
-<TGConnectingPoint num="7" id="3205" />
-<TGConnectingPoint num="8" id="3206" />
-<TGConnectingPoint num="9" id="3207" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3219" >
+<TGConnectingPoint num="0" id="3451" />
+<TGConnectingPoint num="1" id="3452" />
+<TGConnectingPoint num="2" id="3453" />
+<TGConnectingPoint num="3" id="3454" />
+<TGConnectingPoint num="4" id="3455" />
+<TGConnectingPoint num="5" id="3456" />
+<TGConnectingPoint num="6" id="3457" />
+<TGConnectingPoint num="7" id="3458" />
+<TGConnectingPoint num="8" id="3459" />
+<TGConnectingPoint num="9" id="3460" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="3472" >
 <cdparam x="115" y="173" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconind()" />
-<TGConnectingPoint num="0" id="3209" />
-<TGConnectingPoint num="1" id="3210" />
-<TGConnectingPoint num="2" id="3211" />
-<TGConnectingPoint num="3" id="3212" />
-<TGConnectingPoint num="4" id="3213" />
-<TGConnectingPoint num="5" id="3214" />
-<TGConnectingPoint num="6" id="3215" />
-<TGConnectingPoint num="7" id="3216" />
-<TGConnectingPoint num="8" id="3217" />
-<TGConnectingPoint num="9" id="3218" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3260" >
+<TGConnectingPoint num="0" id="3462" />
+<TGConnectingPoint num="1" id="3463" />
+<TGConnectingPoint num="2" id="3464" />
+<TGConnectingPoint num="3" id="3465" />
+<TGConnectingPoint num="4" id="3466" />
+<TGConnectingPoint num="5" id="3467" />
+<TGConnectingPoint num="6" id="3468" />
+<TGConnectingPoint num="7" id="3469" />
+<TGConnectingPoint num="8" id="3470" />
+<TGConnectingPoint num="9" id="3471" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3545" >
 <cdparam x="161" y="96" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="ACTIVE" />
-<TGConnectingPoint num="0" id="3220" />
-<TGConnectingPoint num="1" id="3221" />
-<TGConnectingPoint num="2" id="3222" />
-<TGConnectingPoint num="3" id="3223" />
-<TGConnectingPoint num="4" id="3224" />
-<TGConnectingPoint num="5" id="3225" />
-<TGConnectingPoint num="6" id="3226" />
-<TGConnectingPoint num="7" id="3227" />
-<TGConnectingPoint num="8" id="3228" />
-<TGConnectingPoint num="9" id="3229" />
-<TGConnectingPoint num="10" id="3230" />
-<TGConnectingPoint num="11" id="3231" />
-<TGConnectingPoint num="12" id="3232" />
-<TGConnectingPoint num="13" id="3233" />
-<TGConnectingPoint num="14" id="3234" />
-<TGConnectingPoint num="15" id="3235" />
-<TGConnectingPoint num="16" id="3236" />
-<TGConnectingPoint num="17" id="3237" />
-<TGConnectingPoint num="18" id="3238" />
-<TGConnectingPoint num="19" id="3239" />
-<TGConnectingPoint num="20" id="3240" />
-<TGConnectingPoint num="21" id="3241" />
-<TGConnectingPoint num="22" id="3242" />
-<TGConnectingPoint num="23" id="3243" />
-<TGConnectingPoint num="24" id="3244" />
-<TGConnectingPoint num="25" id="3245" />
-<TGConnectingPoint num="26" id="3246" />
-<TGConnectingPoint num="27" id="3247" />
-<TGConnectingPoint num="28" id="3248" />
-<TGConnectingPoint num="29" id="3249" />
-<TGConnectingPoint num="30" id="3250" />
-<TGConnectingPoint num="31" id="3251" />
-<TGConnectingPoint num="32" id="3252" />
-<TGConnectingPoint num="33" id="3253" />
-<TGConnectingPoint num="34" id="3254" />
-<TGConnectingPoint num="35" id="3255" />
-<TGConnectingPoint num="36" id="3256" />
-<TGConnectingPoint num="37" id="3257" />
-<TGConnectingPoint num="38" id="3258" />
-<TGConnectingPoint num="39" id="3259" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3262" >
+<TGConnectingPoint num="0" id="3473" />
+<TGConnectingPoint num="1" id="3474" />
+<TGConnectingPoint num="2" id="3475" />
+<TGConnectingPoint num="3" id="3476" />
+<TGConnectingPoint num="4" id="3477" />
+<TGConnectingPoint num="5" id="3478" />
+<TGConnectingPoint num="6" id="3479" />
+<TGConnectingPoint num="7" id="3480" />
+<TGConnectingPoint num="8" id="3481" />
+<TGConnectingPoint num="9" id="3482" />
+<TGConnectingPoint num="10" id="3483" />
+<TGConnectingPoint num="11" id="3484" />
+<TGConnectingPoint num="12" id="3485" />
+<TGConnectingPoint num="13" id="3486" />
+<TGConnectingPoint num="14" id="3487" />
+<TGConnectingPoint num="15" id="3488" />
+<TGConnectingPoint num="16" id="3489" />
+<TGConnectingPoint num="17" id="3490" />
+<TGConnectingPoint num="18" id="3491" />
+<TGConnectingPoint num="19" id="3492" />
+<TGConnectingPoint num="20" id="3493" />
+<TGConnectingPoint num="21" id="3494" />
+<TGConnectingPoint num="22" id="3495" />
+<TGConnectingPoint num="23" id="3496" />
+<TGConnectingPoint num="24" id="3497" />
+<TGConnectingPoint num="25" id="3498" />
+<TGConnectingPoint num="26" id="3499" />
+<TGConnectingPoint num="27" id="3500" />
+<TGConnectingPoint num="28" id="3501" />
+<TGConnectingPoint num="29" id="3502" />
+<TGConnectingPoint num="30" id="3503" />
+<TGConnectingPoint num="31" id="3504" />
+<TGConnectingPoint num="32" id="3505" />
+<TGConnectingPoint num="33" id="3506" />
+<TGConnectingPoint num="34" id="3507" />
+<TGConnectingPoint num="35" id="3508" />
+<TGConnectingPoint num="36" id="3509" />
+<TGConnectingPoint num="37" id="3510" />
+<TGConnectingPoint num="38" id="3511" />
+<TGConnectingPoint num="39" id="3512" />
+<TGConnectingPoint num="40" id="3513" />
+<TGConnectingPoint num="41" id="3514" />
+<TGConnectingPoint num="42" id="3515" />
+<TGConnectingPoint num="43" id="3516" />
+<TGConnectingPoint num="44" id="3517" />
+<TGConnectingPoint num="45" id="3518" />
+<TGConnectingPoint num="46" id="3519" />
+<TGConnectingPoint num="47" id="3520" />
+<TGConnectingPoint num="48" id="3521" />
+<TGConnectingPoint num="49" id="3522" />
+<TGConnectingPoint num="50" id="3523" />
+<TGConnectingPoint num="51" id="3524" />
+<TGConnectingPoint num="52" id="3525" />
+<TGConnectingPoint num="53" id="3526" />
+<TGConnectingPoint num="54" id="3527" />
+<TGConnectingPoint num="55" id="3528" />
+<TGConnectingPoint num="56" id="3529" />
+<TGConnectingPoint num="57" id="3530" />
+<TGConnectingPoint num="58" id="3531" />
+<TGConnectingPoint num="59" id="3532" />
+<TGConnectingPoint num="60" id="3533" />
+<TGConnectingPoint num="61" id="3534" />
+<TGConnectingPoint num="62" id="3535" />
+<TGConnectingPoint num="63" id="3536" />
+<TGConnectingPoint num="64" id="3537" />
+<TGConnectingPoint num="65" id="3538" />
+<TGConnectingPoint num="66" id="3539" />
+<TGConnectingPoint num="67" id="3540" />
+<TGConnectingPoint num="68" id="3541" />
+<TGConnectingPoint num="69" id="3542" />
+<TGConnectingPoint num="70" id="3543" />
+<TGConnectingPoint num="71" id="3544" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="3547" >
 <cdparam x="179" y="42" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3261" />
+<TGConnectingPoint num="0" id="3546" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Pilot" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3275" >
+<CONNECTOR type="5102" id="3560" >
 <cdparam x="79" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3271" />
-<TGConnectingPoint num="1" id="3272" />
-<TGConnectingPoint num="2" id="3273" />
-<TGConnectingPoint num="3" id="3274" />
-<P1  x="79" y="166" id="3322" />
-<P2  x="216" y="78" id="3345" />
+<TGConnectingPoint num="0" id="3556" />
+<TGConnectingPoint num="1" id="3557" />
+<TGConnectingPoint num="2" id="3558" />
+<TGConnectingPoint num="3" id="3559" />
+<P1  x="79" y="166" id="3607" />
+<P2  x="216" y="78" id="3630" />
 <Point x="79" y="189" />
 <Point x="341" y="189" />
 <Point x="341" y="78" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3263" >
-<father id="3275" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3548" >
+<father id="3560" num="0" />
 <cdparam x="79" y="189" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3264" >
-<father id="3275" num="1" />
+<SUBCOMPONENT type="-1" id="3549" >
+<father id="3560" num="1" />
 <cdparam x="341" y="189" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3265" >
-<father id="3275" num="2" />
+<SUBCOMPONENT type="-1" id="3550" >
+<father id="3560" num="2" />
 <cdparam x="341" y="78" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3270" >
-<father id="3275" num="3" />
+<SUBCOMPONENT type="-1" id="3555" >
+<father id="3560" num="3" />
 <cdparam x="79" y="206" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3266" />
-<TGConnectingPoint num="1" id="3267" />
-<TGConnectingPoint num="2" id="3268" />
-<TGConnectingPoint num="3" id="3269" />
+<TGConnectingPoint num="0" id="3551" />
+<TGConnectingPoint num="1" id="3552" />
+<TGConnectingPoint num="2" id="3553" />
+<TGConnectingPoint num="3" id="3554" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3288" >
+<CONNECTOR type="5102" id="3573" >
 <cdparam x="177" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3284" />
-<TGConnectingPoint num="1" id="3285" />
-<TGConnectingPoint num="2" id="3286" />
-<TGConnectingPoint num="3" id="3287" />
-<P1  x="177" y="166" id="3311" />
-<P2  x="216" y="91" id="3338" />
+<TGConnectingPoint num="0" id="3569" />
+<TGConnectingPoint num="1" id="3570" />
+<TGConnectingPoint num="2" id="3571" />
+<TGConnectingPoint num="3" id="3572" />
+<P1  x="177" y="166" id="3596" />
+<P2  x="216" y="91" id="3623" />
 <Point x="177" y="183" />
 <Point x="330" y="183" />
 <Point x="330" y="91" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3276" >
-<father id="3288" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3561" >
+<father id="3573" num="0" />
 <cdparam x="177" y="183" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3277" >
-<father id="3288" num="1" />
+<SUBCOMPONENT type="-1" id="3562" >
+<father id="3573" num="1" />
 <cdparam x="330" y="183" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3278" >
-<father id="3288" num="2" />
+<SUBCOMPONENT type="-1" id="3563" >
+<father id="3573" num="2" />
 <cdparam x="330" y="91" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3283" >
-<father id="3288" num="3" />
+<SUBCOMPONENT type="-1" id="3568" >
+<father id="3573" num="3" />
 <cdparam x="177" y="206" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3279" />
-<TGConnectingPoint num="1" id="3280" />
-<TGConnectingPoint num="2" id="3281" />
-<TGConnectingPoint num="3" id="3282" />
+<TGConnectingPoint num="0" id="3564" />
+<TGConnectingPoint num="1" id="3565" />
+<TGConnectingPoint num="2" id="3566" />
+<TGConnectingPoint num="3" id="3567" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3295" >
+<CONNECTOR type="5102" id="3580" >
 <cdparam x="165" y="44" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3294" />
-<P1  x="165" y="44" id="3332" />
-<P2  x="166" y="66" id="3335" />
+<TGConnectingPoint num="0" id="3579" />
+<P1  x="165" y="44" id="3617" />
+<P2  x="166" y="66" id="3620" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3293" >
-<father id="3295" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3578" >
+<father id="3580" num="0" />
 <cdparam x="165" y="84" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3289" />
-<TGConnectingPoint num="1" id="3290" />
-<TGConnectingPoint num="2" id="3291" />
-<TGConnectingPoint num="3" id="3292" />
+<TGConnectingPoint num="0" id="3574" />
+<TGConnectingPoint num="1" id="3575" />
+<TGConnectingPoint num="2" id="3576" />
+<TGConnectingPoint num="3" id="3577" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3302" >
+<CONNECTOR type="5102" id="3587" >
 <cdparam x="178" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3301" />
-<P1  x="128" y="116" id="3362" />
-<P2  x="79" y="136" id="3321" />
+<TGConnectingPoint num="0" id="3586" />
+<P1  x="128" y="116" id="3647" />
+<P2  x="79" y="136" id="3606" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3300" >
-<father id="3302" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3585" >
+<father id="3587" num="0" />
 <cdparam x="178" y="156" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3296" />
-<TGConnectingPoint num="1" id="3297" />
-<TGConnectingPoint num="2" id="3298" />
-<TGConnectingPoint num="3" id="3299" />
+<TGConnectingPoint num="0" id="3581" />
+<TGConnectingPoint num="1" id="3582" />
+<TGConnectingPoint num="2" id="3583" />
+<TGConnectingPoint num="3" id="3584" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3309" >
+<CONNECTOR type="5102" id="3594" >
 <cdparam x="178" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3308" />
-<P1  x="166" y="116" id="3340" />
-<P2  x="177" y="136" id="3310" />
+<TGConnectingPoint num="0" id="3593" />
+<P1  x="166" y="116" id="3625" />
+<P2  x="177" y="136" id="3595" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3307" >
-<father id="3309" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3592" >
+<father id="3594" num="0" />
 <cdparam x="178" y="208" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3303" />
-<TGConnectingPoint num="1" id="3304" />
-<TGConnectingPoint num="2" id="3305" />
-<TGConnectingPoint num="3" id="3306" />
+<TGConnectingPoint num="0" id="3588" />
+<TGConnectingPoint num="1" id="3589" />
+<TGConnectingPoint num="2" id="3590" />
+<TGConnectingPoint num="3" id="3591" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="3320" >
+<COMPONENT type="5104" id="3605" >
 <cdparam x="136" y="141" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconconf()" />
-<TGConnectingPoint num="0" id="3310" />
-<TGConnectingPoint num="1" id="3311" />
-<TGConnectingPoint num="2" id="3312" />
-<TGConnectingPoint num="3" id="3313" />
-<TGConnectingPoint num="4" id="3314" />
-<TGConnectingPoint num="5" id="3315" />
-<TGConnectingPoint num="6" id="3316" />
-<TGConnectingPoint num="7" id="3317" />
-<TGConnectingPoint num="8" id="3318" />
-<TGConnectingPoint num="9" id="3319" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3331" >
+<TGConnectingPoint num="0" id="3595" />
+<TGConnectingPoint num="1" id="3596" />
+<TGConnectingPoint num="2" id="3597" />
+<TGConnectingPoint num="3" id="3598" />
+<TGConnectingPoint num="4" id="3599" />
+<TGConnectingPoint num="5" id="3600" />
+<TGConnectingPoint num="6" id="3601" />
+<TGConnectingPoint num="7" id="3602" />
+<TGConnectingPoint num="8" id="3603" />
+<TGConnectingPoint num="9" id="3604" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="3616" >
 <cdparam x="44" y="141" />
 <sizeparam width="70" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconreq()" />
-<TGConnectingPoint num="0" id="3321" />
-<TGConnectingPoint num="1" id="3322" />
-<TGConnectingPoint num="2" id="3323" />
-<TGConnectingPoint num="3" id="3324" />
-<TGConnectingPoint num="4" id="3325" />
-<TGConnectingPoint num="5" id="3326" />
-<TGConnectingPoint num="6" id="3327" />
-<TGConnectingPoint num="7" id="3328" />
-<TGConnectingPoint num="8" id="3329" />
-<TGConnectingPoint num="9" id="3330" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="3333" >
+<TGConnectingPoint num="0" id="3606" />
+<TGConnectingPoint num="1" id="3607" />
+<TGConnectingPoint num="2" id="3608" />
+<TGConnectingPoint num="3" id="3609" />
+<TGConnectingPoint num="4" id="3610" />
+<TGConnectingPoint num="5" id="3611" />
+<TGConnectingPoint num="6" id="3612" />
+<TGConnectingPoint num="7" id="3613" />
+<TGConnectingPoint num="8" id="3614" />
+<TGConnectingPoint num="9" id="3615" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3618" >
 <cdparam x="158" y="24" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3332" />
+<TGConnectingPoint num="0" id="3617" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3374" >
+<COMPONENT type="5106" id="3691" >
 <cdparam x="116" y="66" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="ACTIVE" />
-<TGConnectingPoint num="0" id="3334" />
-<TGConnectingPoint num="1" id="3335" />
-<TGConnectingPoint num="2" id="3336" />
-<TGConnectingPoint num="3" id="3337" />
-<TGConnectingPoint num="4" id="3338" />
-<TGConnectingPoint num="5" id="3339" />
-<TGConnectingPoint num="6" id="3340" />
-<TGConnectingPoint num="7" id="3341" />
-<TGConnectingPoint num="8" id="3342" />
-<TGConnectingPoint num="9" id="3343" />
-<TGConnectingPoint num="10" id="3344" />
-<TGConnectingPoint num="11" id="3345" />
-<TGConnectingPoint num="12" id="3346" />
-<TGConnectingPoint num="13" id="3347" />
-<TGConnectingPoint num="14" id="3348" />
-<TGConnectingPoint num="15" id="3349" />
-<TGConnectingPoint num="16" id="3350" />
-<TGConnectingPoint num="17" id="3351" />
-<TGConnectingPoint num="18" id="3352" />
-<TGConnectingPoint num="19" id="3353" />
-<TGConnectingPoint num="20" id="3354" />
-<TGConnectingPoint num="21" id="3355" />
-<TGConnectingPoint num="22" id="3356" />
-<TGConnectingPoint num="23" id="3357" />
-<TGConnectingPoint num="24" id="3358" />
-<TGConnectingPoint num="25" id="3359" />
-<TGConnectingPoint num="26" id="3360" />
-<TGConnectingPoint num="27" id="3361" />
-<TGConnectingPoint num="28" id="3362" />
-<TGConnectingPoint num="29" id="3363" />
-<TGConnectingPoint num="30" id="3364" />
-<TGConnectingPoint num="31" id="3365" />
-<TGConnectingPoint num="32" id="3366" />
-<TGConnectingPoint num="33" id="3367" />
-<TGConnectingPoint num="34" id="3368" />
-<TGConnectingPoint num="35" id="3369" />
-<TGConnectingPoint num="36" id="3370" />
-<TGConnectingPoint num="37" id="3371" />
-<TGConnectingPoint num="38" id="3372" />
-<TGConnectingPoint num="39" id="3373" />
+<TGConnectingPoint num="0" id="3619" />
+<TGConnectingPoint num="1" id="3620" />
+<TGConnectingPoint num="2" id="3621" />
+<TGConnectingPoint num="3" id="3622" />
+<TGConnectingPoint num="4" id="3623" />
+<TGConnectingPoint num="5" id="3624" />
+<TGConnectingPoint num="6" id="3625" />
+<TGConnectingPoint num="7" id="3626" />
+<TGConnectingPoint num="8" id="3627" />
+<TGConnectingPoint num="9" id="3628" />
+<TGConnectingPoint num="10" id="3629" />
+<TGConnectingPoint num="11" id="3630" />
+<TGConnectingPoint num="12" id="3631" />
+<TGConnectingPoint num="13" id="3632" />
+<TGConnectingPoint num="14" id="3633" />
+<TGConnectingPoint num="15" id="3634" />
+<TGConnectingPoint num="16" id="3635" />
+<TGConnectingPoint num="17" id="3636" />
+<TGConnectingPoint num="18" id="3637" />
+<TGConnectingPoint num="19" id="3638" />
+<TGConnectingPoint num="20" id="3639" />
+<TGConnectingPoint num="21" id="3640" />
+<TGConnectingPoint num="22" id="3641" />
+<TGConnectingPoint num="23" id="3642" />
+<TGConnectingPoint num="24" id="3643" />
+<TGConnectingPoint num="25" id="3644" />
+<TGConnectingPoint num="26" id="3645" />
+<TGConnectingPoint num="27" id="3646" />
+<TGConnectingPoint num="28" id="3647" />
+<TGConnectingPoint num="29" id="3648" />
+<TGConnectingPoint num="30" id="3649" />
+<TGConnectingPoint num="31" id="3650" />
+<TGConnectingPoint num="32" id="3651" />
+<TGConnectingPoint num="33" id="3652" />
+<TGConnectingPoint num="34" id="3653" />
+<TGConnectingPoint num="35" id="3654" />
+<TGConnectingPoint num="36" id="3655" />
+<TGConnectingPoint num="37" id="3656" />
+<TGConnectingPoint num="38" id="3657" />
+<TGConnectingPoint num="39" id="3658" />
+<TGConnectingPoint num="40" id="3659" />
+<TGConnectingPoint num="41" id="3660" />
+<TGConnectingPoint num="42" id="3661" />
+<TGConnectingPoint num="43" id="3662" />
+<TGConnectingPoint num="44" id="3663" />
+<TGConnectingPoint num="45" id="3664" />
+<TGConnectingPoint num="46" id="3665" />
+<TGConnectingPoint num="47" id="3666" />
+<TGConnectingPoint num="48" id="3667" />
+<TGConnectingPoint num="49" id="3668" />
+<TGConnectingPoint num="50" id="3669" />
+<TGConnectingPoint num="51" id="3670" />
+<TGConnectingPoint num="52" id="3671" />
+<TGConnectingPoint num="53" id="3672" />
+<TGConnectingPoint num="54" id="3673" />
+<TGConnectingPoint num="55" id="3674" />
+<TGConnectingPoint num="56" id="3675" />
+<TGConnectingPoint num="57" id="3676" />
+<TGConnectingPoint num="58" id="3677" />
+<TGConnectingPoint num="59" id="3678" />
+<TGConnectingPoint num="60" id="3679" />
+<TGConnectingPoint num="61" id="3680" />
+<TGConnectingPoint num="62" id="3681" />
+<TGConnectingPoint num="63" id="3682" />
+<TGConnectingPoint num="64" id="3683" />
+<TGConnectingPoint num="65" id="3684" />
+<TGConnectingPoint num="66" id="3685" />
+<TGConnectingPoint num="67" id="3686" />
+<TGConnectingPoint num="68" id="3687" />
+<TGConnectingPoint num="69" id="3688" />
+<TGConnectingPoint num="70" id="3689" />
+<TGConnectingPoint num="71" id="3690" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -6185,18 +6554,19 @@ CC is lost
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
+<considerTimingOperators value="true" />
 <Validated value="" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="3380" >
+<CONNECTOR type="5002" id="3697" >
 <cdparam x="117" y="266" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="3377" />
-<TGConnectingPoint num="1" id="3378" />
-<TGConnectingPoint num="2" id="3379" />
-<P1  x="118" y="320" id="3439" />
-<P2  x="463" y="311" id="3465" />
+<TGConnectingPoint num="0" id="3694" />
+<TGConnectingPoint num="1" id="3695" />
+<TGConnectingPoint num="2" id="3696" />
+<P1  x="118" y="320" id="3756" />
+<P2  x="463" y="311" id="3782" />
 <Point x="118" y="400" />
 <Point x="462" y="400" />
 <AutomaticDrawing  data="true" />
@@ -6205,66 +6575,66 @@ CC is lost
 <isd value="in DR()" />
 <oso value="out CR()" />
 <oso value="out DR()" />
-<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="3375" >
-<father id="3380" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3692" >
+<father id="3697" num="0" />
 <cdparam x="118" y="400" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3376" >
-<father id="3380" num="1" />
+<SUBCOMPONENT type="-1" id="3693" >
+<father id="3697" num="1" />
 <cdparam x="462" y="400" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="3386" >
+<CONNECTOR type="5002" id="3703" >
 <cdparam x="158" y="266" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="3383" />
-<TGConnectingPoint num="1" id="3384" />
-<TGConnectingPoint num="2" id="3385" />
-<P1  x="161" y="320" id="3431" />
-<P2  x="424" y="311" id="3456" />
+<TGConnectingPoint num="0" id="3700" />
+<TGConnectingPoint num="1" id="3701" />
+<TGConnectingPoint num="2" id="3702" />
+<P1  x="161" y="320" id="3748" />
+<P2  x="424" y="311" id="3773" />
 <Point x="161" y="352" />
 <Point x="423" y="352" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in CC()" />
 <osd value="out CC()" />
-<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="true" />
+<FIFOType asynchronous="true" size="1" blocking="false" private="true" broadcast="false" lossy="true" ams="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="3381" >
-<father id="3386" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3698" >
+<father id="3703" num="0" />
 <cdparam x="161" y="352" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="3382" >
-<father id="3386" num="1" />
+<SUBCOMPONENT type="-1" id="3699" >
+<father id="3703" num="1" />
 <cdparam x="423" y="352" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="5002" id="3388" >
+<CONNECTOR type="5002" id="3705" >
 <cdparam x="449" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="3387" />
-<P1  x="423" y="118" id="3481" />
-<P2  x="424" y="134" id="3451" />
+<TGConnectingPoint num="0" id="3704" />
+<P1  x="423" y="118" id="3798" />
+<P2  x="424" y="134" id="3768" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in INconind()" />
@@ -6273,16 +6643,16 @@ CC is lost
 <osd value="out INerror_ground()" />
 <isd value="in INconresp()" />
 <oso value="out INconresp()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="3390" >
+<CONNECTOR type="5002" id="3707" >
 <cdparam x="145" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="3389" />
-<P1  x="161" y="117" id="3506" />
-<P2  x="161" y="138" id="3426" />
+<TGConnectingPoint num="0" id="3706" />
+<P1  x="161" y="117" id="3823" />
+<P2  x="161" y="138" id="3743" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in INconconf()" />
@@ -6291,95 +6661,95 @@ CC is lost
 <osd value="out INerror()" />
 <isd value="in INconreq()" />
 <oso value="out INconreq()" />
-<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" />
+<FIFOType asynchronous="false" size="1" blocking="false" private="true" broadcast="false" lossy="false" ams="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="301" id="3407" >
+<COMPONENT type="301" id="3724" >
 <cdparam x="204" y="333" />
 <sizeparam width="207" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="  CC may be lost (lossy channel).
 " />
-<TGConnectingPoint num="0" id="3391" />
-<TGConnectingPoint num="1" id="3392" />
-<TGConnectingPoint num="2" id="3393" />
-<TGConnectingPoint num="3" id="3394" />
-<TGConnectingPoint num="4" id="3395" />
-<TGConnectingPoint num="5" id="3396" />
-<TGConnectingPoint num="6" id="3397" />
-<TGConnectingPoint num="7" id="3398" />
-<TGConnectingPoint num="8" id="3399" />
-<TGConnectingPoint num="9" id="3400" />
-<TGConnectingPoint num="10" id="3401" />
-<TGConnectingPoint num="11" id="3402" />
-<TGConnectingPoint num="12" id="3403" />
-<TGConnectingPoint num="13" id="3404" />
-<TGConnectingPoint num="14" id="3405" />
-<TGConnectingPoint num="15" id="3406" />
+<TGConnectingPoint num="0" id="3708" />
+<TGConnectingPoint num="1" id="3709" />
+<TGConnectingPoint num="2" id="3710" />
+<TGConnectingPoint num="3" id="3711" />
+<TGConnectingPoint num="4" id="3712" />
+<TGConnectingPoint num="5" id="3713" />
+<TGConnectingPoint num="6" id="3714" />
+<TGConnectingPoint num="7" id="3715" />
+<TGConnectingPoint num="8" id="3716" />
+<TGConnectingPoint num="9" id="3717" />
+<TGConnectingPoint num="10" id="3718" />
+<TGConnectingPoint num="11" id="3719" />
+<TGConnectingPoint num="12" id="3720" />
+<TGConnectingPoint num="13" id="3721" />
+<TGConnectingPoint num="14" id="3722" />
+<TGConnectingPoint num="15" id="3723" />
 <extraparam>
 <Line value="  CC may be lost (lossy channel)." />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="3424" >
+<COMPONENT type="301" id="3741" >
 <cdparam x="234" y="380" />
 <sizeparam width="194" height="15" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="  CRs and DRs will not be lost.
 " />
-<TGConnectingPoint num="0" id="3408" />
-<TGConnectingPoint num="1" id="3409" />
-<TGConnectingPoint num="2" id="3410" />
-<TGConnectingPoint num="3" id="3411" />
-<TGConnectingPoint num="4" id="3412" />
-<TGConnectingPoint num="5" id="3413" />
-<TGConnectingPoint num="6" id="3414" />
-<TGConnectingPoint num="7" id="3415" />
-<TGConnectingPoint num="8" id="3416" />
-<TGConnectingPoint num="9" id="3417" />
-<TGConnectingPoint num="10" id="3418" />
-<TGConnectingPoint num="11" id="3419" />
-<TGConnectingPoint num="12" id="3420" />
-<TGConnectingPoint num="13" id="3421" />
-<TGConnectingPoint num="14" id="3422" />
-<TGConnectingPoint num="15" id="3423" />
+<TGConnectingPoint num="0" id="3725" />
+<TGConnectingPoint num="1" id="3726" />
+<TGConnectingPoint num="2" id="3727" />
+<TGConnectingPoint num="3" id="3728" />
+<TGConnectingPoint num="4" id="3729" />
+<TGConnectingPoint num="5" id="3730" />
+<TGConnectingPoint num="6" id="3731" />
+<TGConnectingPoint num="7" id="3732" />
+<TGConnectingPoint num="8" id="3733" />
+<TGConnectingPoint num="9" id="3734" />
+<TGConnectingPoint num="10" id="3735" />
+<TGConnectingPoint num="11" id="3736" />
+<TGConnectingPoint num="12" id="3737" />
+<TGConnectingPoint num="13" id="3738" />
+<TGConnectingPoint num="14" id="3739" />
+<TGConnectingPoint num="15" id="3740" />
 <extraparam>
 <Line value="  CRs and DRs will not be lost." />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="3449" >
+<COMPONENT type="5000" id="3766" >
 <cdparam x="75" y="138" />
 <sizeparam width="172" height="182" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="OnBoardCommunication" />
-<TGConnectingPoint num="0" id="3425" />
-<TGConnectingPoint num="1" id="3426" />
-<TGConnectingPoint num="2" id="3427" />
-<TGConnectingPoint num="3" id="3428" />
-<TGConnectingPoint num="4" id="3429" />
-<TGConnectingPoint num="5" id="3430" />
-<TGConnectingPoint num="6" id="3431" />
-<TGConnectingPoint num="7" id="3432" />
-<TGConnectingPoint num="8" id="3433" />
-<TGConnectingPoint num="9" id="3434" />
-<TGConnectingPoint num="10" id="3435" />
-<TGConnectingPoint num="11" id="3436" />
-<TGConnectingPoint num="12" id="3437" />
-<TGConnectingPoint num="13" id="3438" />
-<TGConnectingPoint num="14" id="3439" />
-<TGConnectingPoint num="15" id="3440" />
-<TGConnectingPoint num="16" id="3441" />
-<TGConnectingPoint num="17" id="3442" />
-<TGConnectingPoint num="18" id="3443" />
-<TGConnectingPoint num="19" id="3444" />
-<TGConnectingPoint num="20" id="3445" />
-<TGConnectingPoint num="21" id="3446" />
-<TGConnectingPoint num="22" id="3447" />
-<TGConnectingPoint num="23" id="3448" />
+<TGConnectingPoint num="0" id="3742" />
+<TGConnectingPoint num="1" id="3743" />
+<TGConnectingPoint num="2" id="3744" />
+<TGConnectingPoint num="3" id="3745" />
+<TGConnectingPoint num="4" id="3746" />
+<TGConnectingPoint num="5" id="3747" />
+<TGConnectingPoint num="6" id="3748" />
+<TGConnectingPoint num="7" id="3749" />
+<TGConnectingPoint num="8" id="3750" />
+<TGConnectingPoint num="9" id="3751" />
+<TGConnectingPoint num="10" id="3752" />
+<TGConnectingPoint num="11" id="3753" />
+<TGConnectingPoint num="12" id="3754" />
+<TGConnectingPoint num="13" id="3755" />
+<TGConnectingPoint num="14" id="3756" />
+<TGConnectingPoint num="15" id="3757" />
+<TGConnectingPoint num="16" id="3758" />
+<TGConnectingPoint num="17" id="3759" />
+<TGConnectingPoint num="18" id="3760" />
+<TGConnectingPoint num="19" id="3761" />
+<TGConnectingPoint num="20" id="3762" />
+<TGConnectingPoint num="21" id="3763" />
+<TGConnectingPoint num="22" id="3764" />
+<TGConnectingPoint num="23" id="3765" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -6395,36 +6765,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="3474" >
+<COMPONENT type="5000" id="3791" >
 <cdparam x="346" y="134" />
 <sizeparam width="157" height="177" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="GroundCommunication" />
-<TGConnectingPoint num="0" id="3450" />
-<TGConnectingPoint num="1" id="3451" />
-<TGConnectingPoint num="2" id="3452" />
-<TGConnectingPoint num="3" id="3453" />
-<TGConnectingPoint num="4" id="3454" />
-<TGConnectingPoint num="5" id="3455" />
-<TGConnectingPoint num="6" id="3456" />
-<TGConnectingPoint num="7" id="3457" />
-<TGConnectingPoint num="8" id="3458" />
-<TGConnectingPoint num="9" id="3459" />
-<TGConnectingPoint num="10" id="3460" />
-<TGConnectingPoint num="11" id="3461" />
-<TGConnectingPoint num="12" id="3462" />
-<TGConnectingPoint num="13" id="3463" />
-<TGConnectingPoint num="14" id="3464" />
-<TGConnectingPoint num="15" id="3465" />
-<TGConnectingPoint num="16" id="3466" />
-<TGConnectingPoint num="17" id="3467" />
-<TGConnectingPoint num="18" id="3468" />
-<TGConnectingPoint num="19" id="3469" />
-<TGConnectingPoint num="20" id="3470" />
-<TGConnectingPoint num="21" id="3471" />
-<TGConnectingPoint num="22" id="3472" />
-<TGConnectingPoint num="23" id="3473" />
+<TGConnectingPoint num="0" id="3767" />
+<TGConnectingPoint num="1" id="3768" />
+<TGConnectingPoint num="2" id="3769" />
+<TGConnectingPoint num="3" id="3770" />
+<TGConnectingPoint num="4" id="3771" />
+<TGConnectingPoint num="5" id="3772" />
+<TGConnectingPoint num="6" id="3773" />
+<TGConnectingPoint num="7" id="3774" />
+<TGConnectingPoint num="8" id="3775" />
+<TGConnectingPoint num="9" id="3776" />
+<TGConnectingPoint num="10" id="3777" />
+<TGConnectingPoint num="11" id="3778" />
+<TGConnectingPoint num="12" id="3779" />
+<TGConnectingPoint num="13" id="3780" />
+<TGConnectingPoint num="14" id="3781" />
+<TGConnectingPoint num="15" id="3782" />
+<TGConnectingPoint num="16" id="3783" />
+<TGConnectingPoint num="17" id="3784" />
+<TGConnectingPoint num="18" id="3785" />
+<TGConnectingPoint num="19" id="3786" />
+<TGConnectingPoint num="20" id="3787" />
+<TGConnectingPoint num="21" id="3788" />
+<TGConnectingPoint num="22" id="3789" />
+<TGConnectingPoint num="23" id="3790" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -6437,36 +6807,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="3499" >
+<COMPONENT type="5000" id="3816" >
 <cdparam x="346" y="10" />
 <sizeparam width="155" height="108" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Controller" />
-<TGConnectingPoint num="0" id="3475" />
-<TGConnectingPoint num="1" id="3476" />
-<TGConnectingPoint num="2" id="3477" />
-<TGConnectingPoint num="3" id="3478" />
-<TGConnectingPoint num="4" id="3479" />
-<TGConnectingPoint num="5" id="3480" />
-<TGConnectingPoint num="6" id="3481" />
-<TGConnectingPoint num="7" id="3482" />
-<TGConnectingPoint num="8" id="3483" />
-<TGConnectingPoint num="9" id="3484" />
-<TGConnectingPoint num="10" id="3485" />
-<TGConnectingPoint num="11" id="3486" />
-<TGConnectingPoint num="12" id="3487" />
-<TGConnectingPoint num="13" id="3488" />
-<TGConnectingPoint num="14" id="3489" />
-<TGConnectingPoint num="15" id="3490" />
-<TGConnectingPoint num="16" id="3491" />
-<TGConnectingPoint num="17" id="3492" />
-<TGConnectingPoint num="18" id="3493" />
-<TGConnectingPoint num="19" id="3494" />
-<TGConnectingPoint num="20" id="3495" />
-<TGConnectingPoint num="21" id="3496" />
-<TGConnectingPoint num="22" id="3497" />
-<TGConnectingPoint num="23" id="3498" />
+<TGConnectingPoint num="0" id="3792" />
+<TGConnectingPoint num="1" id="3793" />
+<TGConnectingPoint num="2" id="3794" />
+<TGConnectingPoint num="3" id="3795" />
+<TGConnectingPoint num="4" id="3796" />
+<TGConnectingPoint num="5" id="3797" />
+<TGConnectingPoint num="6" id="3798" />
+<TGConnectingPoint num="7" id="3799" />
+<TGConnectingPoint num="8" id="3800" />
+<TGConnectingPoint num="9" id="3801" />
+<TGConnectingPoint num="10" id="3802" />
+<TGConnectingPoint num="11" id="3803" />
+<TGConnectingPoint num="12" id="3804" />
+<TGConnectingPoint num="13" id="3805" />
+<TGConnectingPoint num="14" id="3806" />
+<TGConnectingPoint num="15" id="3807" />
+<TGConnectingPoint num="16" id="3808" />
+<TGConnectingPoint num="17" id="3809" />
+<TGConnectingPoint num="18" id="3810" />
+<TGConnectingPoint num="19" id="3811" />
+<TGConnectingPoint num="20" id="3812" />
+<TGConnectingPoint num="21" id="3813" />
+<TGConnectingPoint num="22" id="3814" />
+<TGConnectingPoint num="23" id="3815" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -6476,36 +6846,36 @@ CC is lost
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="3524" >
+<COMPONENT type="5000" id="3841" >
 <cdparam x="76" y="13" />
 <sizeparam width="171" height="104" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Pilot" />
-<TGConnectingPoint num="0" id="3500" />
-<TGConnectingPoint num="1" id="3501" />
-<TGConnectingPoint num="2" id="3502" />
-<TGConnectingPoint num="3" id="3503" />
-<TGConnectingPoint num="4" id="3504" />
-<TGConnectingPoint num="5" id="3505" />
-<TGConnectingPoint num="6" id="3506" />
-<TGConnectingPoint num="7" id="3507" />
-<TGConnectingPoint num="8" id="3508" />
-<TGConnectingPoint num="9" id="3509" />
-<TGConnectingPoint num="10" id="3510" />
-<TGConnectingPoint num="11" id="3511" />
-<TGConnectingPoint num="12" id="3512" />
-<TGConnectingPoint num="13" id="3513" />
-<TGConnectingPoint num="14" id="3514" />
-<TGConnectingPoint num="15" id="3515" />
-<TGConnectingPoint num="16" id="3516" />
-<TGConnectingPoint num="17" id="3517" />
-<TGConnectingPoint num="18" id="3518" />
-<TGConnectingPoint num="19" id="3519" />
-<TGConnectingPoint num="20" id="3520" />
-<TGConnectingPoint num="21" id="3521" />
-<TGConnectingPoint num="22" id="3522" />
-<TGConnectingPoint num="23" id="3523" />
+<TGConnectingPoint num="0" id="3817" />
+<TGConnectingPoint num="1" id="3818" />
+<TGConnectingPoint num="2" id="3819" />
+<TGConnectingPoint num="3" id="3820" />
+<TGConnectingPoint num="4" id="3821" />
+<TGConnectingPoint num="5" id="3822" />
+<TGConnectingPoint num="6" id="3823" />
+<TGConnectingPoint num="7" id="3824" />
+<TGConnectingPoint num="8" id="3825" />
+<TGConnectingPoint num="9" id="3826" />
+<TGConnectingPoint num="10" id="3827" />
+<TGConnectingPoint num="11" id="3828" />
+<TGConnectingPoint num="12" id="3829" />
+<TGConnectingPoint num="13" id="3830" />
+<TGConnectingPoint num="14" id="3831" />
+<TGConnectingPoint num="15" id="3832" />
+<TGConnectingPoint num="16" id="3833" />
+<TGConnectingPoint num="17" id="3834" />
+<TGConnectingPoint num="18" id="3835" />
+<TGConnectingPoint num="19" id="3836" />
+<TGConnectingPoint num="20" id="3837" />
+<TGConnectingPoint num="21" id="3838" />
+<TGConnectingPoint num="22" id="3839" />
+<TGConnectingPoint num="23" id="3840" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -6519,240 +6889,256 @@ CC is lost
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="OnBoardCommunication" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="3531" >
+<CONNECTOR type="5102" id="3848" >
 <cdparam x="473" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3530" />
-<P1  x="472" y="233" id="3706" />
-<P2  x="472" y="260" id="3689" />
+<TGConnectingPoint num="0" id="3847" />
+<P1  x="472" y="233" id="4055" />
+<P2  x="472" y="260" id="4038" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3529" >
-<father id="3531" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3846" >
+<father id="3848" num="0" />
 <cdparam x="476" y="245" />
 <sizeparam width="35" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3525" />
-<TGConnectingPoint num="1" id="3526" />
-<TGConnectingPoint num="2" id="3527" />
-<TGConnectingPoint num="3" id="3528" />
+<TGConnectingPoint num="0" id="3842" />
+<TGConnectingPoint num="1" id="3843" />
+<TGConnectingPoint num="2" id="3844" />
+<TGConnectingPoint num="3" id="3845" />
 <extraparam>
 <guard value="[ else]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3538" >
+<CONNECTOR type="5102" id="3855" >
 <cdparam x="473" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3537" />
-<P1  x="473" y="165" id="3739" />
-<P2  x="472" y="183" id="3700" />
+<TGConnectingPoint num="0" id="3854" />
+<P1  x="473" y="165" id="4088" />
+<P2  x="472" y="183" id="4049" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3536" >
-<father id="3538" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3853" >
+<father id="3855" num="0" />
 <cdparam x="473" y="205" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3532" />
-<TGConnectingPoint num="1" id="3533" />
-<TGConnectingPoint num="2" id="3534" />
-<TGConnectingPoint num="3" id="3535" />
+<TGConnectingPoint num="0" id="3849" />
+<TGConnectingPoint num="1" id="3850" />
+<TGConnectingPoint num="2" id="3851" />
+<TGConnectingPoint num="3" id="3852" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3545" >
+<CONNECTOR type="5102" id="3862" >
 <cdparam x="630" y="229" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3544" />
-<P1  x="619" y="228" id="3717" />
-<P2  x="619" y="248" id="3831" />
+<TGConnectingPoint num="0" id="3861" />
+<P1  x="619" y="228" id="4066" />
+<P2  x="619" y="248" id="4244" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3543" >
-<father id="3545" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3860" >
+<father id="3862" num="0" />
 <cdparam x="630" y="269" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3539" />
-<TGConnectingPoint num="1" id="3540" />
-<TGConnectingPoint num="2" id="3541" />
-<TGConnectingPoint num="3" id="3542" />
+<TGConnectingPoint num="0" id="3856" />
+<TGConnectingPoint num="1" id="3857" />
+<TGConnectingPoint num="2" id="3858" />
+<TGConnectingPoint num="3" id="3859" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3552" >
+<CONNECTOR type="5102" id="3869" >
 <cdparam x="619" y="174" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3551" />
-<P1  x="619" y="174" id="3843" />
-<P2  x="619" y="198" id="3716" />
+<TGConnectingPoint num="0" id="3868" />
+<P1  x="619" y="174" id="4256" />
+<P2  x="619" y="198" id="4065" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3550" >
-<father id="3552" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3867" >
+<father id="3869" num="0" />
 <cdparam x="619" y="214" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3546" />
-<TGConnectingPoint num="1" id="3547" />
-<TGConnectingPoint num="2" id="3548" />
-<TGConnectingPoint num="3" id="3549" />
+<TGConnectingPoint num="0" id="3863" />
+<TGConnectingPoint num="1" id="3864" />
+<TGConnectingPoint num="2" id="3865" />
+<TGConnectingPoint num="3" id="3866" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3559" >
+<CONNECTOR type="5102" id="3876" >
 <cdparam x="94" y="283" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3558" />
-<P1  x="99" y="284" id="3728" />
-<P2  x="100" y="299" id="3935" />
+<TGConnectingPoint num="0" id="3875" />
+<P1  x="99" y="284" id="4077" />
+<P2  x="100" y="299" id="4412" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3557" >
-<father id="3559" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3874" >
+<father id="3876" num="0" />
 <cdparam x="94" y="323" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3553" />
-<TGConnectingPoint num="1" id="3554" />
-<TGConnectingPoint num="2" id="3555" />
-<TGConnectingPoint num="3" id="3556" />
+<TGConnectingPoint num="0" id="3870" />
+<TGConnectingPoint num="1" id="3871" />
+<TGConnectingPoint num="2" id="3872" />
+<TGConnectingPoint num="3" id="3873" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3566" >
+<CONNECTOR type="5102" id="3883" >
 <cdparam x="98" y="235" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3565" />
-<P1  x="98" y="235" id="3779" />
-<P2  x="99" y="254" id="3727" />
+<TGConnectingPoint num="0" id="3882" />
+<P1  x="98" y="235" id="4128" />
+<P2  x="99" y="254" id="4076" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3564" >
-<father id="3566" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3881" >
+<father id="3883" num="0" />
 <cdparam x="98" y="275" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3560" />
-<TGConnectingPoint num="1" id="3561" />
-<TGConnectingPoint num="2" id="3562" />
-<TGConnectingPoint num="3" id="3563" />
+<TGConnectingPoint num="0" id="3877" />
+<TGConnectingPoint num="1" id="3878" />
+<TGConnectingPoint num="2" id="3879" />
+<TGConnectingPoint num="3" id="3880" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3573" >
+<CONNECTOR type="5102" id="3890" >
 <cdparam x="635" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3572" />
-<P1  x="532" y="109" id="3881" />
-<P2  x="473" y="135" id="3738" />
+<TGConnectingPoint num="0" id="3889" />
+<P1  x="532" y="109" id="4294" />
+<P2  x="473" y="135" id="4087" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3571" >
-<father id="3573" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3888" >
+<father id="3890" num="0" />
 <cdparam x="635" y="149" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3567" />
-<TGConnectingPoint num="1" id="3568" />
-<TGConnectingPoint num="2" id="3569" />
-<TGConnectingPoint num="3" id="3570" />
+<TGConnectingPoint num="0" id="3884" />
+<TGConnectingPoint num="1" id="3885" />
+<TGConnectingPoint num="2" id="3886" />
+<TGConnectingPoint num="3" id="3887" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3580" >
+<CONNECTOR type="5102" id="3897" >
 <cdparam x="86" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3579" />
-<P1  x="86" y="162" id="3947" />
-<P2  x="86" y="193" id="3750" />
+<TGConnectingPoint num="0" id="3896" />
+<P1  x="86" y="162" id="4424" />
+<P2  x="86" y="193" id="4099" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3578" >
-<father id="3580" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3895" >
+<father id="3897" num="0" />
 <cdparam x="93" y="175" />
 <sizeparam width="155" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3574" />
-<TGConnectingPoint num="1" id="3575" />
-<TGConnectingPoint num="2" id="3576" />
-<TGConnectingPoint num="3" id="3577" />
+<TGConnectingPoint num="0" id="3891" />
+<TGConnectingPoint num="1" id="3892" />
+<TGConnectingPoint num="2" id="3893" />
+<TGConnectingPoint num="3" id="3894" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6760,180 +7146,192 @@ CC is lost
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3587" >
+<CONNECTOR type="5102" id="3904" >
 <cdparam x="576" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3586" />
-<P1  x="619" y="109" id="3884" />
-<P2  x="619" y="144" id="3842" />
+<TGConnectingPoint num="0" id="3903" />
+<P1  x="619" y="109" id="4297" />
+<P2  x="619" y="144" id="4255" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3585" >
-<father id="3587" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3902" >
+<father id="3904" num="0" />
 <cdparam x="576" y="151" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3581" />
-<TGConnectingPoint num="1" id="3582" />
-<TGConnectingPoint num="2" id="3583" />
-<TGConnectingPoint num="3" id="3584" />
+<TGConnectingPoint num="0" id="3898" />
+<TGConnectingPoint num="1" id="3899" />
+<TGConnectingPoint num="2" id="3900" />
+<TGConnectingPoint num="3" id="3901" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3594" >
+<CONNECTOR type="5102" id="3911" >
 <cdparam x="85" y="210" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3593" />
-<P1  x="100" y="329" id="3936" />
-<P2  x="100" y="351" id="3895" />
+<TGConnectingPoint num="0" id="3910" />
+<P1  x="100" y="329" id="4413" />
+<P2  x="100" y="351" id="4340" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3592" >
-<father id="3594" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3909" >
+<father id="3911" num="0" />
 <cdparam x="85" y="250" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3588" />
-<TGConnectingPoint num="1" id="3589" />
-<TGConnectingPoint num="2" id="3590" />
-<TGConnectingPoint num="3" id="3591" />
+<TGConnectingPoint num="0" id="3905" />
+<TGConnectingPoint num="1" id="3906" />
+<TGConnectingPoint num="2" id="3907" />
+<TGConnectingPoint num="3" id="3908" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3601" >
+<CONNECTOR type="5102" id="3918" >
 <cdparam x="86" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="3600" />
-<P1  x="86" y="110" id="3963" />
-<P2  x="86" y="132" id="3946" />
+<TGConnectingPoint num="0" id="3917" />
+<P1  x="86" y="110" id="4440" />
+<P2  x="86" y="132" id="4423" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3599" >
-<father id="3601" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3916" >
+<father id="3918" num="0" />
 <cdparam x="86" y="150" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3595" />
-<TGConnectingPoint num="1" id="3596" />
-<TGConnectingPoint num="2" id="3597" />
-<TGConnectingPoint num="3" id="3598" />
+<TGConnectingPoint num="0" id="3912" />
+<TGConnectingPoint num="1" id="3913" />
+<TGConnectingPoint num="2" id="3914" />
+<TGConnectingPoint num="3" id="3915" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3608" >
+<CONNECTOR type="5102" id="3925" >
 <cdparam x="80" y="37" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="3607" />
-<P1  x="67" y="36" id="3998" />
-<P2  x="86" y="60" id="3958" />
+<TGConnectingPoint num="0" id="3924" />
+<P1  x="67" y="36" id="4507" />
+<P2  x="86" y="60" id="4435" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3606" >
-<father id="3608" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3923" >
+<father id="3925" num="0" />
 <cdparam x="82" y="38" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3602" />
-<TGConnectingPoint num="1" id="3603" />
-<TGConnectingPoint num="2" id="3604" />
-<TGConnectingPoint num="3" id="3605" />
+<TGConnectingPoint num="0" id="3919" />
+<TGConnectingPoint num="1" id="3920" />
+<TGConnectingPoint num="2" id="3921" />
+<TGConnectingPoint num="3" id="3922" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3615" >
+<CONNECTOR type="5102" id="3932" >
 <cdparam x="619" y="278" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3614" />
-<P1  x="619" y="278" id="3832" />
-<P2  x="619" y="302" id="3791" />
+<TGConnectingPoint num="0" id="3931" />
+<P1  x="619" y="278" id="4245" />
+<P2  x="619" y="302" id="4172" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3613" >
-<father id="3615" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3930" >
+<father id="3932" num="0" />
 <cdparam x="619" y="318" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3609" />
-<TGConnectingPoint num="1" id="3610" />
-<TGConnectingPoint num="2" id="3611" />
-<TGConnectingPoint num="3" id="3612" />
+<TGConnectingPoint num="0" id="3926" />
+<TGConnectingPoint num="1" id="3927" />
+<TGConnectingPoint num="2" id="3928" />
+<TGConnectingPoint num="3" id="3929" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3622" >
+<CONNECTOR type="5102" id="3939" >
 <cdparam x="286" y="212" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3621" />
-<P1  x="447" y="208" id="3701" />
-<P2  x="138" y="208" id="3772" />
+<TGConnectingPoint num="0" id="3938" />
+<P1  x="447" y="208" id="4050" />
+<P2  x="138" y="208" id="4121" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3620" >
-<father id="3622" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3937" >
+<father id="3939" num="0" />
 <cdparam x="154" y="206" />
 <sizeparam width="302" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3616" />
-<TGConnectingPoint num="1" id="3617" />
-<TGConnectingPoint num="2" id="3618" />
-<TGConnectingPoint num="3" id="3619" />
+<TGConnectingPoint num="0" id="3933" />
+<TGConnectingPoint num="1" id="3934" />
+<TGConnectingPoint num="2" id="3935" />
+<TGConnectingPoint num="3" id="3936" />
 <extraparam>
 <guard value="[ retransmissionCounter &lt; maxRetransmissions]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
@@ -6941,1304 +7339,1712 @@ CC is lost
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3629" >
+<CONNECTOR type="5102" id="3946" >
 <cdparam x="473" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3628" />
-<P1  x="472" y="290" id="3690" />
-<P2  x="473" y="308" id="3637" />
+<TGConnectingPoint num="0" id="3945" />
+<P1  x="472" y="290" id="4039" />
+<P2  x="473" y="308" id="3954" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3627" >
-<father id="3629" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3944" >
+<father id="3946" num="0" />
 <cdparam x="466" y="297" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3623" />
-<TGConnectingPoint num="1" id="3624" />
-<TGConnectingPoint num="2" id="3625" />
-<TGConnectingPoint num="3" id="3626" />
+<TGConnectingPoint num="0" id="3940" />
+<TGConnectingPoint num="1" id="3941" />
+<TGConnectingPoint num="2" id="3942" />
+<TGConnectingPoint num="3" id="3943" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3636" >
+<CONNECTOR type="5102" id="3953" >
 <cdparam x="459" y="334" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="3635" />
-<P1  x="473" y="338" id="3638" />
-<P2  x="473" y="366" id="3665" />
+<TGConnectingPoint num="0" id="3952" />
+<P1  x="473" y="338" id="3955" />
+<P2  x="473" y="366" id="3982" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3634" >
-<father id="3636" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3951" >
+<father id="3953" num="0" />
 <cdparam x="459" y="350" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3630" />
-<TGConnectingPoint num="1" id="3631" />
-<TGConnectingPoint num="2" id="3632" />
-<TGConnectingPoint num="3" id="3633" />
+<TGConnectingPoint num="0" id="3947" />
+<TGConnectingPoint num="1" id="3948" />
+<TGConnectingPoint num="2" id="3949" />
+<TGConnectingPoint num="3" id="3950" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="3647" >
+<COMPONENT type="5103" id="3964" >
 <cdparam x="456" y="313" />
 <sizeparam width="35" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="DR()" />
-<TGConnectingPoint num="0" id="3637" />
-<TGConnectingPoint num="1" id="3638" />
-<TGConnectingPoint num="2" id="3639" />
-<TGConnectingPoint num="3" id="3640" />
-<TGConnectingPoint num="4" id="3641" />
-<TGConnectingPoint num="5" id="3642" />
-<TGConnectingPoint num="6" id="3643" />
-<TGConnectingPoint num="7" id="3644" />
-<TGConnectingPoint num="8" id="3645" />
-<TGConnectingPoint num="9" id="3646" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3688" >
+<TGConnectingPoint num="0" id="3954" />
+<TGConnectingPoint num="1" id="3955" />
+<TGConnectingPoint num="2" id="3956" />
+<TGConnectingPoint num="3" id="3957" />
+<TGConnectingPoint num="4" id="3958" />
+<TGConnectingPoint num="5" id="3959" />
+<TGConnectingPoint num="6" id="3960" />
+<TGConnectingPoint num="7" id="3961" />
+<TGConnectingPoint num="8" id="3962" />
+<TGConnectingPoint num="9" id="3963" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4037" >
 <cdparam x="436" y="366" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="ERROR" />
-<TGConnectingPoint num="0" id="3648" />
-<TGConnectingPoint num="1" id="3649" />
-<TGConnectingPoint num="2" id="3650" />
-<TGConnectingPoint num="3" id="3651" />
-<TGConnectingPoint num="4" id="3652" />
-<TGConnectingPoint num="5" id="3653" />
-<TGConnectingPoint num="6" id="3654" />
-<TGConnectingPoint num="7" id="3655" />
-<TGConnectingPoint num="8" id="3656" />
-<TGConnectingPoint num="9" id="3657" />
-<TGConnectingPoint num="10" id="3658" />
-<TGConnectingPoint num="11" id="3659" />
-<TGConnectingPoint num="12" id="3660" />
-<TGConnectingPoint num="13" id="3661" />
-<TGConnectingPoint num="14" id="3662" />
-<TGConnectingPoint num="15" id="3663" />
-<TGConnectingPoint num="16" id="3664" />
-<TGConnectingPoint num="17" id="3665" />
-<TGConnectingPoint num="18" id="3666" />
-<TGConnectingPoint num="19" id="3667" />
-<TGConnectingPoint num="20" id="3668" />
-<TGConnectingPoint num="21" id="3669" />
-<TGConnectingPoint num="22" id="3670" />
-<TGConnectingPoint num="23" id="3671" />
-<TGConnectingPoint num="24" id="3672" />
-<TGConnectingPoint num="25" id="3673" />
-<TGConnectingPoint num="26" id="3674" />
-<TGConnectingPoint num="27" id="3675" />
-<TGConnectingPoint num="28" id="3676" />
-<TGConnectingPoint num="29" id="3677" />
-<TGConnectingPoint num="30" id="3678" />
-<TGConnectingPoint num="31" id="3679" />
-<TGConnectingPoint num="32" id="3680" />
-<TGConnectingPoint num="33" id="3681" />
-<TGConnectingPoint num="34" id="3682" />
-<TGConnectingPoint num="35" id="3683" />
-<TGConnectingPoint num="36" id="3684" />
-<TGConnectingPoint num="37" id="3685" />
-<TGConnectingPoint num="38" id="3686" />
-<TGConnectingPoint num="39" id="3687" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3699" >
+<TGConnectingPoint num="0" id="3965" />
+<TGConnectingPoint num="1" id="3966" />
+<TGConnectingPoint num="2" id="3967" />
+<TGConnectingPoint num="3" id="3968" />
+<TGConnectingPoint num="4" id="3969" />
+<TGConnectingPoint num="5" id="3970" />
+<TGConnectingPoint num="6" id="3971" />
+<TGConnectingPoint num="7" id="3972" />
+<TGConnectingPoint num="8" id="3973" />
+<TGConnectingPoint num="9" id="3974" />
+<TGConnectingPoint num="10" id="3975" />
+<TGConnectingPoint num="11" id="3976" />
+<TGConnectingPoint num="12" id="3977" />
+<TGConnectingPoint num="13" id="3978" />
+<TGConnectingPoint num="14" id="3979" />
+<TGConnectingPoint num="15" id="3980" />
+<TGConnectingPoint num="16" id="3981" />
+<TGConnectingPoint num="17" id="3982" />
+<TGConnectingPoint num="18" id="3983" />
+<TGConnectingPoint num="19" id="3984" />
+<TGConnectingPoint num="20" id="3985" />
+<TGConnectingPoint num="21" id="3986" />
+<TGConnectingPoint num="22" id="3987" />
+<TGConnectingPoint num="23" id="3988" />
+<TGConnectingPoint num="24" id="3989" />
+<TGConnectingPoint num="25" id="3990" />
+<TGConnectingPoint num="26" id="3991" />
+<TGConnectingPoint num="27" id="3992" />
+<TGConnectingPoint num="28" id="3993" />
+<TGConnectingPoint num="29" id="3994" />
+<TGConnectingPoint num="30" id="3995" />
+<TGConnectingPoint num="31" id="3996" />
+<TGConnectingPoint num="32" id="3997" />
+<TGConnectingPoint num="33" id="3998" />
+<TGConnectingPoint num="34" id="3999" />
+<TGConnectingPoint num="35" id="4000" />
+<TGConnectingPoint num="36" id="4001" />
+<TGConnectingPoint num="37" id="4002" />
+<TGConnectingPoint num="38" id="4003" />
+<TGConnectingPoint num="39" id="4004" />
+<TGConnectingPoint num="40" id="4005" />
+<TGConnectingPoint num="41" id="4006" />
+<TGConnectingPoint num="42" id="4007" />
+<TGConnectingPoint num="43" id="4008" />
+<TGConnectingPoint num="44" id="4009" />
+<TGConnectingPoint num="45" id="4010" />
+<TGConnectingPoint num="46" id="4011" />
+<TGConnectingPoint num="47" id="4012" />
+<TGConnectingPoint num="48" id="4013" />
+<TGConnectingPoint num="49" id="4014" />
+<TGConnectingPoint num="50" id="4015" />
+<TGConnectingPoint num="51" id="4016" />
+<TGConnectingPoint num="52" id="4017" />
+<TGConnectingPoint num="53" id="4018" />
+<TGConnectingPoint num="54" id="4019" />
+<TGConnectingPoint num="55" id="4020" />
+<TGConnectingPoint num="56" id="4021" />
+<TGConnectingPoint num="57" id="4022" />
+<TGConnectingPoint num="58" id="4023" />
+<TGConnectingPoint num="59" id="4024" />
+<TGConnectingPoint num="60" id="4025" />
+<TGConnectingPoint num="61" id="4026" />
+<TGConnectingPoint num="62" id="4027" />
+<TGConnectingPoint num="63" id="4028" />
+<TGConnectingPoint num="64" id="4029" />
+<TGConnectingPoint num="65" id="4030" />
+<TGConnectingPoint num="66" id="4031" />
+<TGConnectingPoint num="67" id="4032" />
+<TGConnectingPoint num="68" id="4033" />
+<TGConnectingPoint num="69" id="4034" />
+<TGConnectingPoint num="70" id="4035" />
+<TGConnectingPoint num="71" id="4036" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="4048" >
 <cdparam x="443" y="265" />
 <sizeparam width="59" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INerror()" />
-<TGConnectingPoint num="0" id="3689" />
-<TGConnectingPoint num="1" id="3690" />
-<TGConnectingPoint num="2" id="3691" />
-<TGConnectingPoint num="3" id="3692" />
-<TGConnectingPoint num="4" id="3693" />
-<TGConnectingPoint num="5" id="3694" />
-<TGConnectingPoint num="6" id="3695" />
-<TGConnectingPoint num="7" id="3696" />
-<TGConnectingPoint num="8" id="3697" />
-<TGConnectingPoint num="9" id="3698" />
-</COMPONENT>
-
-<COMPONENT type="5107" id="3715" >
+<TGConnectingPoint num="0" id="4038" />
+<TGConnectingPoint num="1" id="4039" />
+<TGConnectingPoint num="2" id="4040" />
+<TGConnectingPoint num="3" id="4041" />
+<TGConnectingPoint num="4" id="4042" />
+<TGConnectingPoint num="5" id="4043" />
+<TGConnectingPoint num="6" id="4044" />
+<TGConnectingPoint num="7" id="4045" />
+<TGConnectingPoint num="8" id="4046" />
+<TGConnectingPoint num="9" id="4047" />
+</COMPONENT>
+
+<COMPONENT type="5107" id="4064" >
 <cdparam x="457" y="193" />
 <sizeparam width="30" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="3700" />
-<TGConnectingPoint num="1" id="3701" />
-<TGConnectingPoint num="2" id="3702" />
-<TGConnectingPoint num="3" id="3703" />
-<TGConnectingPoint num="4" id="3704" />
-<TGConnectingPoint num="5" id="3705" />
-<TGConnectingPoint num="6" id="3706" />
-<TGConnectingPoint num="7" id="3707" />
-<TGConnectingPoint num="8" id="3708" />
-<TGConnectingPoint num="9" id="3709" />
-<TGConnectingPoint num="10" id="3710" />
-<TGConnectingPoint num="11" id="3711" />
-<TGConnectingPoint num="12" id="3712" />
-<TGConnectingPoint num="13" id="3713" />
-<TGConnectingPoint num="14" id="3714" />
-</COMPONENT>
-
-<COMPONENT type="5110" id="3726" >
+<TGConnectingPoint num="0" id="4049" />
+<TGConnectingPoint num="1" id="4050" />
+<TGConnectingPoint num="2" id="4051" />
+<TGConnectingPoint num="3" id="4052" />
+<TGConnectingPoint num="4" id="4053" />
+<TGConnectingPoint num="5" id="4054" />
+<TGConnectingPoint num="6" id="4055" />
+<TGConnectingPoint num="7" id="4056" />
+<TGConnectingPoint num="8" id="4057" />
+<TGConnectingPoint num="9" id="4058" />
+<TGConnectingPoint num="10" id="4059" />
+<TGConnectingPoint num="11" id="4060" />
+<TGConnectingPoint num="12" id="4061" />
+<TGConnectingPoint num="13" id="4062" />
+<TGConnectingPoint num="14" id="4063" />
+</COMPONENT>
+
+<COMPONENT type="5110" id="4075" >
 <cdparam x="577" y="203" />
 <sizeparam width="85" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Reset timer" value="reset(ATST1)" />
-<TGConnectingPoint num="0" id="3716" />
-<TGConnectingPoint num="1" id="3717" />
-<TGConnectingPoint num="2" id="3718" />
-<TGConnectingPoint num="3" id="3719" />
-<TGConnectingPoint num="4" id="3720" />
-<TGConnectingPoint num="5" id="3721" />
-<TGConnectingPoint num="6" id="3722" />
-<TGConnectingPoint num="7" id="3723" />
-<TGConnectingPoint num="8" id="3724" />
-<TGConnectingPoint num="9" id="3725" />
-</COMPONENT>
-
-<COMPONENT type="5109" id="3737" >
+<TGConnectingPoint num="0" id="4065" />
+<TGConnectingPoint num="1" id="4066" />
+<TGConnectingPoint num="2" id="4067" />
+<TGConnectingPoint num="3" id="4068" />
+<TGConnectingPoint num="4" id="4069" />
+<TGConnectingPoint num="5" id="4070" />
+<TGConnectingPoint num="6" id="4071" />
+<TGConnectingPoint num="7" id="4072" />
+<TGConnectingPoint num="8" id="4073" />
+<TGConnectingPoint num="9" id="4074" />
+</COMPONENT>
+
+<COMPONENT type="5109" id="4086" >
 <cdparam x="36" y="259" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Set timer" value="setTimer(ATST1,10)" />
-<TGConnectingPoint num="0" id="3727" />
-<TGConnectingPoint num="1" id="3728" />
-<TGConnectingPoint num="2" id="3729" />
-<TGConnectingPoint num="3" id="3730" />
-<TGConnectingPoint num="4" id="3731" />
-<TGConnectingPoint num="5" id="3732" />
-<TGConnectingPoint num="6" id="3733" />
-<TGConnectingPoint num="7" id="3734" />
-<TGConnectingPoint num="8" id="3735" />
-<TGConnectingPoint num="9" id="3736" />
-</COMPONENT>
-
-<COMPONENT type="5111" id="3748" >
+<TGConnectingPoint num="0" id="4076" />
+<TGConnectingPoint num="1" id="4077" />
+<TGConnectingPoint num="2" id="4078" />
+<TGConnectingPoint num="3" id="4079" />
+<TGConnectingPoint num="4" id="4080" />
+<TGConnectingPoint num="5" id="4081" />
+<TGConnectingPoint num="6" id="4082" />
+<TGConnectingPoint num="7" id="4083" />
+<TGConnectingPoint num="8" id="4084" />
+<TGConnectingPoint num="9" id="4085" />
+</COMPONENT>
+
+<COMPONENT type="5111" id="4097" >
 <cdparam x="422" y="140" />
 <sizeparam width="103" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Reset timer" value="expire(ATST1)" />
-<TGConnectingPoint num="0" id="3738" />
-<TGConnectingPoint num="1" id="3739" />
-<TGConnectingPoint num="2" id="3740" />
-<TGConnectingPoint num="3" id="3741" />
-<TGConnectingPoint num="4" id="3742" />
-<TGConnectingPoint num="5" id="3743" />
-<TGConnectingPoint num="6" id="3744" />
-<TGConnectingPoint num="7" id="3745" />
-<TGConnectingPoint num="8" id="3746" />
-<TGConnectingPoint num="9" id="3747" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3789" >
+<TGConnectingPoint num="0" id="4087" />
+<TGConnectingPoint num="1" id="4088" />
+<TGConnectingPoint num="2" id="4089" />
+<TGConnectingPoint num="3" id="4090" />
+<TGConnectingPoint num="4" id="4091" />
+<TGConnectingPoint num="5" id="4092" />
+<TGConnectingPoint num="6" id="4093" />
+<TGConnectingPoint num="7" id="4094" />
+<TGConnectingPoint num="8" id="4095" />
+<TGConnectingPoint num="9" id="4096" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4170" >
 <cdparam x="35" y="193" />
 <sizeparam width="103" height="42" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="SEND" />
-<TGConnectingPoint num="0" id="3749" />
-<TGConnectingPoint num="1" id="3750" />
-<TGConnectingPoint num="2" id="3751" />
-<TGConnectingPoint num="3" id="3752" />
-<TGConnectingPoint num="4" id="3753" />
-<TGConnectingPoint num="5" id="3754" />
-<TGConnectingPoint num="6" id="3755" />
-<TGConnectingPoint num="7" id="3756" />
-<TGConnectingPoint num="8" id="3757" />
-<TGConnectingPoint num="9" id="3758" />
-<TGConnectingPoint num="10" id="3759" />
-<TGConnectingPoint num="11" id="3760" />
-<TGConnectingPoint num="12" id="3761" />
-<TGConnectingPoint num="13" id="3762" />
-<TGConnectingPoint num="14" id="3763" />
-<TGConnectingPoint num="15" id="3764" />
-<TGConnectingPoint num="16" id="3765" />
-<TGConnectingPoint num="17" id="3766" />
-<TGConnectingPoint num="18" id="3767" />
-<TGConnectingPoint num="19" id="3768" />
-<TGConnectingPoint num="20" id="3769" />
-<TGConnectingPoint num="21" id="3770" />
-<TGConnectingPoint num="22" id="3771" />
-<TGConnectingPoint num="23" id="3772" />
-<TGConnectingPoint num="24" id="3773" />
-<TGConnectingPoint num="25" id="3774" />
-<TGConnectingPoint num="26" id="3775" />
-<TGConnectingPoint num="27" id="3776" />
-<TGConnectingPoint num="28" id="3777" />
-<TGConnectingPoint num="29" id="3778" />
-<TGConnectingPoint num="30" id="3779" />
-<TGConnectingPoint num="31" id="3780" />
-<TGConnectingPoint num="32" id="3781" />
-<TGConnectingPoint num="33" id="3782" />
-<TGConnectingPoint num="34" id="3783" />
-<TGConnectingPoint num="35" id="3784" />
-<TGConnectingPoint num="36" id="3785" />
-<TGConnectingPoint num="37" id="3786" />
-<TGConnectingPoint num="38" id="3787" />
-<TGConnectingPoint num="39" id="3788" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3830" >
+<TGConnectingPoint num="0" id="4098" />
+<TGConnectingPoint num="1" id="4099" />
+<TGConnectingPoint num="2" id="4100" />
+<TGConnectingPoint num="3" id="4101" />
+<TGConnectingPoint num="4" id="4102" />
+<TGConnectingPoint num="5" id="4103" />
+<TGConnectingPoint num="6" id="4104" />
+<TGConnectingPoint num="7" id="4105" />
+<TGConnectingPoint num="8" id="4106" />
+<TGConnectingPoint num="9" id="4107" />
+<TGConnectingPoint num="10" id="4108" />
+<TGConnectingPoint num="11" id="4109" />
+<TGConnectingPoint num="12" id="4110" />
+<TGConnectingPoint num="13" id="4111" />
+<TGConnectingPoint num="14" id="4112" />
+<TGConnectingPoint num="15" id="4113" />
+<TGConnectingPoint num="16" id="4114" />
+<TGConnectingPoint num="17" id="4115" />
+<TGConnectingPoint num="18" id="4116" />
+<TGConnectingPoint num="19" id="4117" />
+<TGConnectingPoint num="20" id="4118" />
+<TGConnectingPoint num="21" id="4119" />
+<TGConnectingPoint num="22" id="4120" />
+<TGConnectingPoint num="23" id="4121" />
+<TGConnectingPoint num="24" id="4122" />
+<TGConnectingPoint num="25" id="4123" />
+<TGConnectingPoint num="26" id="4124" />
+<TGConnectingPoint num="27" id="4125" />
+<TGConnectingPoint num="28" id="4126" />
+<TGConnectingPoint num="29" id="4127" />
+<TGConnectingPoint num="30" id="4128" />
+<TGConnectingPoint num="31" id="4129" />
+<TGConnectingPoint num="32" id="4130" />
+<TGConnectingPoint num="33" id="4131" />
+<TGConnectingPoint num="34" id="4132" />
+<TGConnectingPoint num="35" id="4133" />
+<TGConnectingPoint num="36" id="4134" />
+<TGConnectingPoint num="37" id="4135" />
+<TGConnectingPoint num="38" id="4136" />
+<TGConnectingPoint num="39" id="4137" />
+<TGConnectingPoint num="40" id="4138" />
+<TGConnectingPoint num="41" id="4139" />
+<TGConnectingPoint num="42" id="4140" />
+<TGConnectingPoint num="43" id="4141" />
+<TGConnectingPoint num="44" id="4142" />
+<TGConnectingPoint num="45" id="4143" />
+<TGConnectingPoint num="46" id="4144" />
+<TGConnectingPoint num="47" id="4145" />
+<TGConnectingPoint num="48" id="4146" />
+<TGConnectingPoint num="49" id="4147" />
+<TGConnectingPoint num="50" id="4148" />
+<TGConnectingPoint num="51" id="4149" />
+<TGConnectingPoint num="52" id="4150" />
+<TGConnectingPoint num="53" id="4151" />
+<TGConnectingPoint num="54" id="4152" />
+<TGConnectingPoint num="55" id="4153" />
+<TGConnectingPoint num="56" id="4154" />
+<TGConnectingPoint num="57" id="4155" />
+<TGConnectingPoint num="58" id="4156" />
+<TGConnectingPoint num="59" id="4157" />
+<TGConnectingPoint num="60" id="4158" />
+<TGConnectingPoint num="61" id="4159" />
+<TGConnectingPoint num="62" id="4160" />
+<TGConnectingPoint num="63" id="4161" />
+<TGConnectingPoint num="64" id="4162" />
+<TGConnectingPoint num="65" id="4163" />
+<TGConnectingPoint num="66" id="4164" />
+<TGConnectingPoint num="67" id="4165" />
+<TGConnectingPoint num="68" id="4166" />
+<TGConnectingPoint num="69" id="4167" />
+<TGConnectingPoint num="70" id="4168" />
+<TGConnectingPoint num="71" id="4169" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4243" >
 <cdparam x="569" y="302" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="CONNECTED" />
-<TGConnectingPoint num="0" id="3790" />
-<TGConnectingPoint num="1" id="3791" />
-<TGConnectingPoint num="2" id="3792" />
-<TGConnectingPoint num="3" id="3793" />
-<TGConnectingPoint num="4" id="3794" />
-<TGConnectingPoint num="5" id="3795" />
-<TGConnectingPoint num="6" id="3796" />
-<TGConnectingPoint num="7" id="3797" />
-<TGConnectingPoint num="8" id="3798" />
-<TGConnectingPoint num="9" id="3799" />
-<TGConnectingPoint num="10" id="3800" />
-<TGConnectingPoint num="11" id="3801" />
-<TGConnectingPoint num="12" id="3802" />
-<TGConnectingPoint num="13" id="3803" />
-<TGConnectingPoint num="14" id="3804" />
-<TGConnectingPoint num="15" id="3805" />
-<TGConnectingPoint num="16" id="3806" />
-<TGConnectingPoint num="17" id="3807" />
-<TGConnectingPoint num="18" id="3808" />
-<TGConnectingPoint num="19" id="3809" />
-<TGConnectingPoint num="20" id="3810" />
-<TGConnectingPoint num="21" id="3811" />
-<TGConnectingPoint num="22" id="3812" />
-<TGConnectingPoint num="23" id="3813" />
-<TGConnectingPoint num="24" id="3814" />
-<TGConnectingPoint num="25" id="3815" />
-<TGConnectingPoint num="26" id="3816" />
-<TGConnectingPoint num="27" id="3817" />
-<TGConnectingPoint num="28" id="3818" />
-<TGConnectingPoint num="29" id="3819" />
-<TGConnectingPoint num="30" id="3820" />
-<TGConnectingPoint num="31" id="3821" />
-<TGConnectingPoint num="32" id="3822" />
-<TGConnectingPoint num="33" id="3823" />
-<TGConnectingPoint num="34" id="3824" />
-<TGConnectingPoint num="35" id="3825" />
-<TGConnectingPoint num="36" id="3826" />
-<TGConnectingPoint num="37" id="3827" />
-<TGConnectingPoint num="38" id="3828" />
-<TGConnectingPoint num="39" id="3829" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3841" >
+<TGConnectingPoint num="0" id="4171" />
+<TGConnectingPoint num="1" id="4172" />
+<TGConnectingPoint num="2" id="4173" />
+<TGConnectingPoint num="3" id="4174" />
+<TGConnectingPoint num="4" id="4175" />
+<TGConnectingPoint num="5" id="4176" />
+<TGConnectingPoint num="6" id="4177" />
+<TGConnectingPoint num="7" id="4178" />
+<TGConnectingPoint num="8" id="4179" />
+<TGConnectingPoint num="9" id="4180" />
+<TGConnectingPoint num="10" id="4181" />
+<TGConnectingPoint num="11" id="4182" />
+<TGConnectingPoint num="12" id="4183" />
+<TGConnectingPoint num="13" id="4184" />
+<TGConnectingPoint num="14" id="4185" />
+<TGConnectingPoint num="15" id="4186" />
+<TGConnectingPoint num="16" id="4187" />
+<TGConnectingPoint num="17" id="4188" />
+<TGConnectingPoint num="18" id="4189" />
+<TGConnectingPoint num="19" id="4190" />
+<TGConnectingPoint num="20" id="4191" />
+<TGConnectingPoint num="21" id="4192" />
+<TGConnectingPoint num="22" id="4193" />
+<TGConnectingPoint num="23" id="4194" />
+<TGConnectingPoint num="24" id="4195" />
+<TGConnectingPoint num="25" id="4196" />
+<TGConnectingPoint num="26" id="4197" />
+<TGConnectingPoint num="27" id="4198" />
+<TGConnectingPoint num="28" id="4199" />
+<TGConnectingPoint num="29" id="4200" />
+<TGConnectingPoint num="30" id="4201" />
+<TGConnectingPoint num="31" id="4202" />
+<TGConnectingPoint num="32" id="4203" />
+<TGConnectingPoint num="33" id="4204" />
+<TGConnectingPoint num="34" id="4205" />
+<TGConnectingPoint num="35" id="4206" />
+<TGConnectingPoint num="36" id="4207" />
+<TGConnectingPoint num="37" id="4208" />
+<TGConnectingPoint num="38" id="4209" />
+<TGConnectingPoint num="39" id="4210" />
+<TGConnectingPoint num="40" id="4211" />
+<TGConnectingPoint num="41" id="4212" />
+<TGConnectingPoint num="42" id="4213" />
+<TGConnectingPoint num="43" id="4214" />
+<TGConnectingPoint num="44" id="4215" />
+<TGConnectingPoint num="45" id="4216" />
+<TGConnectingPoint num="46" id="4217" />
+<TGConnectingPoint num="47" id="4218" />
+<TGConnectingPoint num="48" id="4219" />
+<TGConnectingPoint num="49" id="4220" />
+<TGConnectingPoint num="50" id="4221" />
+<TGConnectingPoint num="51" id="4222" />
+<TGConnectingPoint num="52" id="4223" />
+<TGConnectingPoint num="53" id="4224" />
+<TGConnectingPoint num="54" id="4225" />
+<TGConnectingPoint num="55" id="4226" />
+<TGConnectingPoint num="56" id="4227" />
+<TGConnectingPoint num="57" id="4228" />
+<TGConnectingPoint num="58" id="4229" />
+<TGConnectingPoint num="59" id="4230" />
+<TGConnectingPoint num="60" id="4231" />
+<TGConnectingPoint num="61" id="4232" />
+<TGConnectingPoint num="62" id="4233" />
+<TGConnectingPoint num="63" id="4234" />
+<TGConnectingPoint num="64" id="4235" />
+<TGConnectingPoint num="65" id="4236" />
+<TGConnectingPoint num="66" id="4237" />
+<TGConnectingPoint num="67" id="4238" />
+<TGConnectingPoint num="68" id="4239" />
+<TGConnectingPoint num="69" id="4240" />
+<TGConnectingPoint num="70" id="4241" />
+<TGConnectingPoint num="71" id="4242" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="4254" >
 <cdparam x="582" y="253" />
 <sizeparam width="74" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconconf()" />
-<TGConnectingPoint num="0" id="3831" />
-<TGConnectingPoint num="1" id="3832" />
-<TGConnectingPoint num="2" id="3833" />
-<TGConnectingPoint num="3" id="3834" />
-<TGConnectingPoint num="4" id="3835" />
-<TGConnectingPoint num="5" id="3836" />
-<TGConnectingPoint num="6" id="3837" />
-<TGConnectingPoint num="7" id="3838" />
-<TGConnectingPoint num="8" id="3839" />
-<TGConnectingPoint num="9" id="3840" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3852" >
+<TGConnectingPoint num="0" id="4244" />
+<TGConnectingPoint num="1" id="4245" />
+<TGConnectingPoint num="2" id="4246" />
+<TGConnectingPoint num="3" id="4247" />
+<TGConnectingPoint num="4" id="4248" />
+<TGConnectingPoint num="5" id="4249" />
+<TGConnectingPoint num="6" id="4250" />
+<TGConnectingPoint num="7" id="4251" />
+<TGConnectingPoint num="8" id="4252" />
+<TGConnectingPoint num="9" id="4253" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4265" >
 <cdparam x="598" y="149" />
 <sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="CC()" />
-<TGConnectingPoint num="0" id="3842" />
-<TGConnectingPoint num="1" id="3843" />
-<TGConnectingPoint num="2" id="3844" />
-<TGConnectingPoint num="3" id="3845" />
-<TGConnectingPoint num="4" id="3846" />
-<TGConnectingPoint num="5" id="3847" />
-<TGConnectingPoint num="6" id="3848" />
-<TGConnectingPoint num="7" id="3849" />
-<TGConnectingPoint num="8" id="3850" />
-<TGConnectingPoint num="9" id="3851" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3893" >
+<TGConnectingPoint num="0" id="4255" />
+<TGConnectingPoint num="1" id="4256" />
+<TGConnectingPoint num="2" id="4257" />
+<TGConnectingPoint num="3" id="4258" />
+<TGConnectingPoint num="4" id="4259" />
+<TGConnectingPoint num="5" id="4260" />
+<TGConnectingPoint num="6" id="4261" />
+<TGConnectingPoint num="7" id="4262" />
+<TGConnectingPoint num="8" id="4263" />
+<TGConnectingPoint num="9" id="4264" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4338" >
 <cdparam x="518" y="58" />
 <sizeparam width="117" height="51" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_CONF" />
-<TGConnectingPoint num="0" id="3853" />
-<TGConnectingPoint num="1" id="3854" />
-<TGConnectingPoint num="2" id="3855" />
-<TGConnectingPoint num="3" id="3856" />
-<TGConnectingPoint num="4" id="3857" />
-<TGConnectingPoint num="5" id="3858" />
-<TGConnectingPoint num="6" id="3859" />
-<TGConnectingPoint num="7" id="3860" />
-<TGConnectingPoint num="8" id="3861" />
-<TGConnectingPoint num="9" id="3862" />
-<TGConnectingPoint num="10" id="3863" />
-<TGConnectingPoint num="11" id="3864" />
-<TGConnectingPoint num="12" id="3865" />
-<TGConnectingPoint num="13" id="3866" />
-<TGConnectingPoint num="14" id="3867" />
-<TGConnectingPoint num="15" id="3868" />
-<TGConnectingPoint num="16" id="3869" />
-<TGConnectingPoint num="17" id="3870" />
-<TGConnectingPoint num="18" id="3871" />
-<TGConnectingPoint num="19" id="3872" />
-<TGConnectingPoint num="20" id="3873" />
-<TGConnectingPoint num="21" id="3874" />
-<TGConnectingPoint num="22" id="3875" />
-<TGConnectingPoint num="23" id="3876" />
-<TGConnectingPoint num="24" id="3877" />
-<TGConnectingPoint num="25" id="3878" />
-<TGConnectingPoint num="26" id="3879" />
-<TGConnectingPoint num="27" id="3880" />
-<TGConnectingPoint num="28" id="3881" />
-<TGConnectingPoint num="29" id="3882" />
-<TGConnectingPoint num="30" id="3883" />
-<TGConnectingPoint num="31" id="3884" />
-<TGConnectingPoint num="32" id="3885" />
-<TGConnectingPoint num="33" id="3886" />
-<TGConnectingPoint num="34" id="3887" />
-<TGConnectingPoint num="35" id="3888" />
-<TGConnectingPoint num="36" id="3889" />
-<TGConnectingPoint num="37" id="3890" />
-<TGConnectingPoint num="38" id="3891" />
-<TGConnectingPoint num="39" id="3892" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3934" >
+<TGConnectingPoint num="0" id="4266" />
+<TGConnectingPoint num="1" id="4267" />
+<TGConnectingPoint num="2" id="4268" />
+<TGConnectingPoint num="3" id="4269" />
+<TGConnectingPoint num="4" id="4270" />
+<TGConnectingPoint num="5" id="4271" />
+<TGConnectingPoint num="6" id="4272" />
+<TGConnectingPoint num="7" id="4273" />
+<TGConnectingPoint num="8" id="4274" />
+<TGConnectingPoint num="9" id="4275" />
+<TGConnectingPoint num="10" id="4276" />
+<TGConnectingPoint num="11" id="4277" />
+<TGConnectingPoint num="12" id="4278" />
+<TGConnectingPoint num="13" id="4279" />
+<TGConnectingPoint num="14" id="4280" />
+<TGConnectingPoint num="15" id="4281" />
+<TGConnectingPoint num="16" id="4282" />
+<TGConnectingPoint num="17" id="4283" />
+<TGConnectingPoint num="18" id="4284" />
+<TGConnectingPoint num="19" id="4285" />
+<TGConnectingPoint num="20" id="4286" />
+<TGConnectingPoint num="21" id="4287" />
+<TGConnectingPoint num="22" id="4288" />
+<TGConnectingPoint num="23" id="4289" />
+<TGConnectingPoint num="24" id="4290" />
+<TGConnectingPoint num="25" id="4291" />
+<TGConnectingPoint num="26" id="4292" />
+<TGConnectingPoint num="27" id="4293" />
+<TGConnectingPoint num="28" id="4294" />
+<TGConnectingPoint num="29" id="4295" />
+<TGConnectingPoint num="30" id="4296" />
+<TGConnectingPoint num="31" id="4297" />
+<TGConnectingPoint num="32" id="4298" />
+<TGConnectingPoint num="33" id="4299" />
+<TGConnectingPoint num="34" id="4300" />
+<TGConnectingPoint num="35" id="4301" />
+<TGConnectingPoint num="36" id="4302" />
+<TGConnectingPoint num="37" id="4303" />
+<TGConnectingPoint num="38" id="4304" />
+<TGConnectingPoint num="39" id="4305" />
+<TGConnectingPoint num="40" id="4306" />
+<TGConnectingPoint num="41" id="4307" />
+<TGConnectingPoint num="42" id="4308" />
+<TGConnectingPoint num="43" id="4309" />
+<TGConnectingPoint num="44" id="4310" />
+<TGConnectingPoint num="45" id="4311" />
+<TGConnectingPoint num="46" id="4312" />
+<TGConnectingPoint num="47" id="4313" />
+<TGConnectingPoint num="48" id="4314" />
+<TGConnectingPoint num="49" id="4315" />
+<TGConnectingPoint num="50" id="4316" />
+<TGConnectingPoint num="51" id="4317" />
+<TGConnectingPoint num="52" id="4318" />
+<TGConnectingPoint num="53" id="4319" />
+<TGConnectingPoint num="54" id="4320" />
+<TGConnectingPoint num="55" id="4321" />
+<TGConnectingPoint num="56" id="4322" />
+<TGConnectingPoint num="57" id="4323" />
+<TGConnectingPoint num="58" id="4324" />
+<TGConnectingPoint num="59" id="4325" />
+<TGConnectingPoint num="60" id="4326" />
+<TGConnectingPoint num="61" id="4327" />
+<TGConnectingPoint num="62" id="4328" />
+<TGConnectingPoint num="63" id="4329" />
+<TGConnectingPoint num="64" id="4330" />
+<TGConnectingPoint num="65" id="4331" />
+<TGConnectingPoint num="66" id="4332" />
+<TGConnectingPoint num="67" id="4333" />
+<TGConnectingPoint num="68" id="4334" />
+<TGConnectingPoint num="69" id="4335" />
+<TGConnectingPoint num="70" id="4336" />
+<TGConnectingPoint num="71" id="4337" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4411" >
 <cdparam x="32" y="351" />
 <sizeparam width="137" height="52" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_CONF" />
-<TGConnectingPoint num="0" id="3894" />
-<TGConnectingPoint num="1" id="3895" />
-<TGConnectingPoint num="2" id="3896" />
-<TGConnectingPoint num="3" id="3897" />
-<TGConnectingPoint num="4" id="3898" />
-<TGConnectingPoint num="5" id="3899" />
-<TGConnectingPoint num="6" id="3900" />
-<TGConnectingPoint num="7" id="3901" />
-<TGConnectingPoint num="8" id="3902" />
-<TGConnectingPoint num="9" id="3903" />
-<TGConnectingPoint num="10" id="3904" />
-<TGConnectingPoint num="11" id="3905" />
-<TGConnectingPoint num="12" id="3906" />
-<TGConnectingPoint num="13" id="3907" />
-<TGConnectingPoint num="14" id="3908" />
-<TGConnectingPoint num="15" id="3909" />
-<TGConnectingPoint num="16" id="3910" />
-<TGConnectingPoint num="17" id="3911" />
-<TGConnectingPoint num="18" id="3912" />
-<TGConnectingPoint num="19" id="3913" />
-<TGConnectingPoint num="20" id="3914" />
-<TGConnectingPoint num="21" id="3915" />
-<TGConnectingPoint num="22" id="3916" />
-<TGConnectingPoint num="23" id="3917" />
-<TGConnectingPoint num="24" id="3918" />
-<TGConnectingPoint num="25" id="3919" />
-<TGConnectingPoint num="26" id="3920" />
-<TGConnectingPoint num="27" id="3921" />
-<TGConnectingPoint num="28" id="3922" />
-<TGConnectingPoint num="29" id="3923" />
-<TGConnectingPoint num="30" id="3924" />
-<TGConnectingPoint num="31" id="3925" />
-<TGConnectingPoint num="32" id="3926" />
-<TGConnectingPoint num="33" id="3927" />
-<TGConnectingPoint num="34" id="3928" />
-<TGConnectingPoint num="35" id="3929" />
-<TGConnectingPoint num="36" id="3930" />
-<TGConnectingPoint num="37" id="3931" />
-<TGConnectingPoint num="38" id="3932" />
-<TGConnectingPoint num="39" id="3933" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="3945" >
+<TGConnectingPoint num="0" id="4339" />
+<TGConnectingPoint num="1" id="4340" />
+<TGConnectingPoint num="2" id="4341" />
+<TGConnectingPoint num="3" id="4342" />
+<TGConnectingPoint num="4" id="4343" />
+<TGConnectingPoint num="5" id="4344" />
+<TGConnectingPoint num="6" id="4345" />
+<TGConnectingPoint num="7" id="4346" />
+<TGConnectingPoint num="8" id="4347" />
+<TGConnectingPoint num="9" id="4348" />
+<TGConnectingPoint num="10" id="4349" />
+<TGConnectingPoint num="11" id="4350" />
+<TGConnectingPoint num="12" id="4351" />
+<TGConnectingPoint num="13" id="4352" />
+<TGConnectingPoint num="14" id="4353" />
+<TGConnectingPoint num="15" id="4354" />
+<TGConnectingPoint num="16" id="4355" />
+<TGConnectingPoint num="17" id="4356" />
+<TGConnectingPoint num="18" id="4357" />
+<TGConnectingPoint num="19" id="4358" />
+<TGConnectingPoint num="20" id="4359" />
+<TGConnectingPoint num="21" id="4360" />
+<TGConnectingPoint num="22" id="4361" />
+<TGConnectingPoint num="23" id="4362" />
+<TGConnectingPoint num="24" id="4363" />
+<TGConnectingPoint num="25" id="4364" />
+<TGConnectingPoint num="26" id="4365" />
+<TGConnectingPoint num="27" id="4366" />
+<TGConnectingPoint num="28" id="4367" />
+<TGConnectingPoint num="29" id="4368" />
+<TGConnectingPoint num="30" id="4369" />
+<TGConnectingPoint num="31" id="4370" />
+<TGConnectingPoint num="32" id="4371" />
+<TGConnectingPoint num="33" id="4372" />
+<TGConnectingPoint num="34" id="4373" />
+<TGConnectingPoint num="35" id="4374" />
+<TGConnectingPoint num="36" id="4375" />
+<TGConnectingPoint num="37" id="4376" />
+<TGConnectingPoint num="38" id="4377" />
+<TGConnectingPoint num="39" id="4378" />
+<TGConnectingPoint num="40" id="4379" />
+<TGConnectingPoint num="41" id="4380" />
+<TGConnectingPoint num="42" id="4381" />
+<TGConnectingPoint num="43" id="4382" />
+<TGConnectingPoint num="44" id="4383" />
+<TGConnectingPoint num="45" id="4384" />
+<TGConnectingPoint num="46" id="4385" />
+<TGConnectingPoint num="47" id="4386" />
+<TGConnectingPoint num="48" id="4387" />
+<TGConnectingPoint num="49" id="4388" />
+<TGConnectingPoint num="50" id="4389" />
+<TGConnectingPoint num="51" id="4390" />
+<TGConnectingPoint num="52" id="4391" />
+<TGConnectingPoint num="53" id="4392" />
+<TGConnectingPoint num="54" id="4393" />
+<TGConnectingPoint num="55" id="4394" />
+<TGConnectingPoint num="56" id="4395" />
+<TGConnectingPoint num="57" id="4396" />
+<TGConnectingPoint num="58" id="4397" />
+<TGConnectingPoint num="59" id="4398" />
+<TGConnectingPoint num="60" id="4399" />
+<TGConnectingPoint num="61" id="4400" />
+<TGConnectingPoint num="62" id="4401" />
+<TGConnectingPoint num="63" id="4402" />
+<TGConnectingPoint num="64" id="4403" />
+<TGConnectingPoint num="65" id="4404" />
+<TGConnectingPoint num="66" id="4405" />
+<TGConnectingPoint num="67" id="4406" />
+<TGConnectingPoint num="68" id="4407" />
+<TGConnectingPoint num="69" id="4408" />
+<TGConnectingPoint num="70" id="4409" />
+<TGConnectingPoint num="71" id="4410" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="4422" >
 <cdparam x="83" y="304" />
 <sizeparam width="34" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="CR()" />
-<TGConnectingPoint num="0" id="3935" />
-<TGConnectingPoint num="1" id="3936" />
-<TGConnectingPoint num="2" id="3937" />
-<TGConnectingPoint num="3" id="3938" />
-<TGConnectingPoint num="4" id="3939" />
-<TGConnectingPoint num="5" id="3940" />
-<TGConnectingPoint num="6" id="3941" />
-<TGConnectingPoint num="7" id="3942" />
-<TGConnectingPoint num="8" id="3943" />
-<TGConnectingPoint num="9" id="3944" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="3956" >
+<TGConnectingPoint num="0" id="4412" />
+<TGConnectingPoint num="1" id="4413" />
+<TGConnectingPoint num="2" id="4414" />
+<TGConnectingPoint num="3" id="4415" />
+<TGConnectingPoint num="4" id="4416" />
+<TGConnectingPoint num="5" id="4417" />
+<TGConnectingPoint num="6" id="4418" />
+<TGConnectingPoint num="7" id="4419" />
+<TGConnectingPoint num="8" id="4420" />
+<TGConnectingPoint num="9" id="4421" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4433" >
 <cdparam x="47" y="137" />
 <sizeparam width="78" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconreq()" />
-<TGConnectingPoint num="0" id="3946" />
-<TGConnectingPoint num="1" id="3947" />
-<TGConnectingPoint num="2" id="3948" />
-<TGConnectingPoint num="3" id="3949" />
-<TGConnectingPoint num="4" id="3950" />
-<TGConnectingPoint num="5" id="3951" />
-<TGConnectingPoint num="6" id="3952" />
-<TGConnectingPoint num="7" id="3953" />
-<TGConnectingPoint num="8" id="3954" />
-<TGConnectingPoint num="9" id="3955" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="3997" >
+<TGConnectingPoint num="0" id="4423" />
+<TGConnectingPoint num="1" id="4424" />
+<TGConnectingPoint num="2" id="4425" />
+<TGConnectingPoint num="3" id="4426" />
+<TGConnectingPoint num="4" id="4427" />
+<TGConnectingPoint num="5" id="4428" />
+<TGConnectingPoint num="6" id="4429" />
+<TGConnectingPoint num="7" id="4430" />
+<TGConnectingPoint num="8" id="4431" />
+<TGConnectingPoint num="9" id="4432" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4506" >
 <cdparam x="36" y="60" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="3957" />
-<TGConnectingPoint num="1" id="3958" />
-<TGConnectingPoint num="2" id="3959" />
-<TGConnectingPoint num="3" id="3960" />
-<TGConnectingPoint num="4" id="3961" />
-<TGConnectingPoint num="5" id="3962" />
-<TGConnectingPoint num="6" id="3963" />
-<TGConnectingPoint num="7" id="3964" />
-<TGConnectingPoint num="8" id="3965" />
-<TGConnectingPoint num="9" id="3966" />
-<TGConnectingPoint num="10" id="3967" />
-<TGConnectingPoint num="11" id="3968" />
-<TGConnectingPoint num="12" id="3969" />
-<TGConnectingPoint num="13" id="3970" />
-<TGConnectingPoint num="14" id="3971" />
-<TGConnectingPoint num="15" id="3972" />
-<TGConnectingPoint num="16" id="3973" />
-<TGConnectingPoint num="17" id="3974" />
-<TGConnectingPoint num="18" id="3975" />
-<TGConnectingPoint num="19" id="3976" />
-<TGConnectingPoint num="20" id="3977" />
-<TGConnectingPoint num="21" id="3978" />
-<TGConnectingPoint num="22" id="3979" />
-<TGConnectingPoint num="23" id="3980" />
-<TGConnectingPoint num="24" id="3981" />
-<TGConnectingPoint num="25" id="3982" />
-<TGConnectingPoint num="26" id="3983" />
-<TGConnectingPoint num="27" id="3984" />
-<TGConnectingPoint num="28" id="3985" />
-<TGConnectingPoint num="29" id="3986" />
-<TGConnectingPoint num="30" id="3987" />
-<TGConnectingPoint num="31" id="3988" />
-<TGConnectingPoint num="32" id="3989" />
-<TGConnectingPoint num="33" id="3990" />
-<TGConnectingPoint num="34" id="3991" />
-<TGConnectingPoint num="35" id="3992" />
-<TGConnectingPoint num="36" id="3993" />
-<TGConnectingPoint num="37" id="3994" />
-<TGConnectingPoint num="38" id="3995" />
-<TGConnectingPoint num="39" id="3996" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="3999" >
+<TGConnectingPoint num="0" id="4434" />
+<TGConnectingPoint num="1" id="4435" />
+<TGConnectingPoint num="2" id="4436" />
+<TGConnectingPoint num="3" id="4437" />
+<TGConnectingPoint num="4" id="4438" />
+<TGConnectingPoint num="5" id="4439" />
+<TGConnectingPoint num="6" id="4440" />
+<TGConnectingPoint num="7" id="4441" />
+<TGConnectingPoint num="8" id="4442" />
+<TGConnectingPoint num="9" id="4443" />
+<TGConnectingPoint num="10" id="4444" />
+<TGConnectingPoint num="11" id="4445" />
+<TGConnectingPoint num="12" id="4446" />
+<TGConnectingPoint num="13" id="4447" />
+<TGConnectingPoint num="14" id="4448" />
+<TGConnectingPoint num="15" id="4449" />
+<TGConnectingPoint num="16" id="4450" />
+<TGConnectingPoint num="17" id="4451" />
+<TGConnectingPoint num="18" id="4452" />
+<TGConnectingPoint num="19" id="4453" />
+<TGConnectingPoint num="20" id="4454" />
+<TGConnectingPoint num="21" id="4455" />
+<TGConnectingPoint num="22" id="4456" />
+<TGConnectingPoint num="23" id="4457" />
+<TGConnectingPoint num="24" id="4458" />
+<TGConnectingPoint num="25" id="4459" />
+<TGConnectingPoint num="26" id="4460" />
+<TGConnectingPoint num="27" id="4461" />
+<TGConnectingPoint num="28" id="4462" />
+<TGConnectingPoint num="29" id="4463" />
+<TGConnectingPoint num="30" id="4464" />
+<TGConnectingPoint num="31" id="4465" />
+<TGConnectingPoint num="32" id="4466" />
+<TGConnectingPoint num="33" id="4467" />
+<TGConnectingPoint num="34" id="4468" />
+<TGConnectingPoint num="35" id="4469" />
+<TGConnectingPoint num="36" id="4470" />
+<TGConnectingPoint num="37" id="4471" />
+<TGConnectingPoint num="38" id="4472" />
+<TGConnectingPoint num="39" id="4473" />
+<TGConnectingPoint num="40" id="4474" />
+<TGConnectingPoint num="41" id="4475" />
+<TGConnectingPoint num="42" id="4476" />
+<TGConnectingPoint num="43" id="4477" />
+<TGConnectingPoint num="44" id="4478" />
+<TGConnectingPoint num="45" id="4479" />
+<TGConnectingPoint num="46" id="4480" />
+<TGConnectingPoint num="47" id="4481" />
+<TGConnectingPoint num="48" id="4482" />
+<TGConnectingPoint num="49" id="4483" />
+<TGConnectingPoint num="50" id="4484" />
+<TGConnectingPoint num="51" id="4485" />
+<TGConnectingPoint num="52" id="4486" />
+<TGConnectingPoint num="53" id="4487" />
+<TGConnectingPoint num="54" id="4488" />
+<TGConnectingPoint num="55" id="4489" />
+<TGConnectingPoint num="56" id="4490" />
+<TGConnectingPoint num="57" id="4491" />
+<TGConnectingPoint num="58" id="4492" />
+<TGConnectingPoint num="59" id="4493" />
+<TGConnectingPoint num="60" id="4494" />
+<TGConnectingPoint num="61" id="4495" />
+<TGConnectingPoint num="62" id="4496" />
+<TGConnectingPoint num="63" id="4497" />
+<TGConnectingPoint num="64" id="4498" />
+<TGConnectingPoint num="65" id="4499" />
+<TGConnectingPoint num="66" id="4500" />
+<TGConnectingPoint num="67" id="4501" />
+<TGConnectingPoint num="68" id="4502" />
+<TGConnectingPoint num="69" id="4503" />
+<TGConnectingPoint num="70" id="4504" />
+<TGConnectingPoint num="71" id="4505" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4508" >
 <cdparam x="60" y="16" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3998" />
+<TGConnectingPoint num="0" id="4507" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="GroundCommunication" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4006" >
+<CONNECTOR type="5102" id="4515" >
 <cdparam x="483" y="115" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4005" />
-<P1  x="490" y="122" id="4308" />
-<P2  x="490" y="143" id="4239" />
+<TGConnectingPoint num="0" id="4514" />
+<P1  x="490" y="122" id="4945" />
+<P2  x="490" y="143" id="4844" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4004" >
-<father id="4006" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4513" >
+<father id="4515" num="0" />
 <cdparam x="486" y="129" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4000" />
-<TGConnectingPoint num="1" id="4001" />
-<TGConnectingPoint num="2" id="4002" />
-<TGConnectingPoint num="3" id="4003" />
+<TGConnectingPoint num="0" id="4509" />
+<TGConnectingPoint num="1" id="4510" />
+<TGConnectingPoint num="2" id="4511" />
+<TGConnectingPoint num="3" id="4512" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4013" >
+<CONNECTOR type="5102" id="4522" >
 <cdparam x="492" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4012" />
-<P1  x="490" y="173" id="4240" />
-<P2  x="490" y="197" id="4250" />
+<TGConnectingPoint num="0" id="4521" />
+<P1  x="490" y="173" id="4845" />
+<P2  x="490" y="197" id="4855" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4011" >
-<father id="4013" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4520" >
+<father id="4522" num="0" />
 <cdparam x="491" y="186" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4007" />
-<TGConnectingPoint num="1" id="4008" />
-<TGConnectingPoint num="2" id="4009" />
-<TGConnectingPoint num="3" id="4010" />
+<TGConnectingPoint num="0" id="4516" />
+<TGConnectingPoint num="1" id="4517" />
+<TGConnectingPoint num="2" id="4518" />
+<TGConnectingPoint num="3" id="4519" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4020" >
+<CONNECTOR type="5102" id="4529" >
 <cdparam x="490" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4019" />
-<P1  x="490" y="227" id="4251" />
-<P2  x="490" y="255" id="4262" />
+<TGConnectingPoint num="0" id="4528" />
+<P1  x="490" y="227" id="4856" />
+<P2  x="490" y="255" id="4867" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4018" >
-<father id="4020" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4527" >
+<father id="4529" num="0" />
 <cdparam x="486" y="224" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4014" />
-<TGConnectingPoint num="1" id="4015" />
-<TGConnectingPoint num="2" id="4016" />
-<TGConnectingPoint num="3" id="4017" />
+<TGConnectingPoint num="0" id="4523" />
+<TGConnectingPoint num="1" id="4524" />
+<TGConnectingPoint num="2" id="4525" />
+<TGConnectingPoint num="3" id="4526" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4027" >
+<CONNECTOR type="5102" id="4536" >
 <cdparam x="86" y="48" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4026" />
-<P1  x="75" y="47" id="4237" />
-<P2  x="87" y="72" id="4197" />
+<TGConnectingPoint num="0" id="4535" />
+<P1  x="75" y="47" id="4842" />
+<P2  x="87" y="72" id="4770" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4025" >
-<father id="4027" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4534" >
+<father id="4536" num="0" />
 <cdparam x="86" y="88" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4021" />
-<TGConnectingPoint num="1" id="4022" />
-<TGConnectingPoint num="2" id="4023" />
-<TGConnectingPoint num="3" id="4024" />
+<TGConnectingPoint num="0" id="4530" />
+<TGConnectingPoint num="1" id="4531" />
+<TGConnectingPoint num="2" id="4532" />
+<TGConnectingPoint num="3" id="4533" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4034" >
+<CONNECTOR type="5102" id="4543" >
 <cdparam x="99" y="122" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4033" />
-<P1  x="99" y="122" id="4226" />
-<P2  x="99" y="151" id="4185" />
+<TGConnectingPoint num="0" id="4542" />
+<P1  x="99" y="122" id="4799" />
+<P2  x="99" y="151" id="4758" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4032" >
-<father id="4034" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4541" >
+<father id="4543" num="0" />
 <cdparam x="99" y="162" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4028" />
-<TGConnectingPoint num="1" id="4029" />
-<TGConnectingPoint num="2" id="4030" />
-<TGConnectingPoint num="3" id="4031" />
+<TGConnectingPoint num="0" id="4537" />
+<TGConnectingPoint num="1" id="4538" />
+<TGConnectingPoint num="2" id="4539" />
+<TGConnectingPoint num="3" id="4540" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4041" >
+<CONNECTOR type="5102" id="4550" >
 <cdparam x="99" y="181" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4040" />
-<P1  x="99" y="181" id="4186" />
-<P2  x="99" y="207" id="4174" />
+<TGConnectingPoint num="0" id="4549" />
+<P1  x="99" y="181" id="4759" />
+<P2  x="99" y="207" id="4747" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4039" >
-<father id="4041" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4548" >
+<father id="4550" num="0" />
 <cdparam x="99" y="221" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4035" />
-<TGConnectingPoint num="1" id="4036" />
-<TGConnectingPoint num="2" id="4037" />
-<TGConnectingPoint num="3" id="4038" />
+<TGConnectingPoint num="0" id="4544" />
+<TGConnectingPoint num="1" id="4545" />
+<TGConnectingPoint num="2" id="4546" />
+<TGConnectingPoint num="3" id="4547" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4048" >
+<CONNECTOR type="5102" id="4557" >
 <cdparam x="99" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4047" />
-<P1  x="99" y="237" id="4175" />
-<P2  x="99" y="262" id="4134" />
+<TGConnectingPoint num="0" id="4556" />
+<P1  x="99" y="237" id="4748" />
+<P2  x="99" y="262" id="4675" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4046" >
-<father id="4048" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4555" >
+<father id="4557" num="0" />
 <cdparam x="99" y="277" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4042" />
-<TGConnectingPoint num="1" id="4043" />
-<TGConnectingPoint num="2" id="4044" />
-<TGConnectingPoint num="3" id="4045" />
+<TGConnectingPoint num="0" id="4551" />
+<TGConnectingPoint num="1" id="4552" />
+<TGConnectingPoint num="2" id="4553" />
+<TGConnectingPoint num="3" id="4554" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4055" >
+<CONNECTOR type="5102" id="4564" >
 <cdparam x="327" y="119" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4054" />
-<P1  x="326" y="119" id="4122" />
-<P2  x="327" y="145" id="4081" />
+<TGConnectingPoint num="0" id="4563" />
+<P1  x="326" y="119" id="4631" />
+<P2  x="327" y="145" id="4590" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4053" >
-<father id="4055" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4562" >
+<father id="4564" num="0" />
 <cdparam x="327" y="159" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4049" />
-<TGConnectingPoint num="1" id="4050" />
-<TGConnectingPoint num="2" id="4051" />
-<TGConnectingPoint num="3" id="4052" />
+<TGConnectingPoint num="0" id="4558" />
+<TGConnectingPoint num="1" id="4559" />
+<TGConnectingPoint num="2" id="4560" />
+<TGConnectingPoint num="3" id="4561" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4062" >
+<CONNECTOR type="5102" id="4571" >
 <cdparam x="327" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4061" />
-<P1  x="327" y="175" id="4082" />
-<P2  x="327" y="204" id="4070" />
+<TGConnectingPoint num="0" id="4570" />
+<P1  x="327" y="175" id="4591" />
+<P2  x="327" y="204" id="4579" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4060" >
-<father id="4062" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4569" >
+<father id="4571" num="0" />
 <cdparam x="327" y="215" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4056" />
-<TGConnectingPoint num="1" id="4057" />
-<TGConnectingPoint num="2" id="4058" />
-<TGConnectingPoint num="3" id="4059" />
+<TGConnectingPoint num="0" id="4565" />
+<TGConnectingPoint num="1" id="4566" />
+<TGConnectingPoint num="2" id="4567" />
+<TGConnectingPoint num="3" id="4568" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4069" >
+<CONNECTOR type="5102" id="4578" >
 <cdparam x="327" y="234" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4068" />
-<P1  x="327" y="234" id="4071" />
-<P2  x="327" y="266" id="4344" />
+<TGConnectingPoint num="0" id="4577" />
+<P1  x="327" y="234" id="4580" />
+<P2  x="327" y="266" id="5013" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4067" >
-<father id="4069" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4576" >
+<father id="4578" num="0" />
 <cdparam x="331" y="251" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4063" />
-<TGConnectingPoint num="1" id="4064" />
-<TGConnectingPoint num="2" id="4065" />
-<TGConnectingPoint num="3" id="4066" />
+<TGConnectingPoint num="0" id="4572" />
+<TGConnectingPoint num="1" id="4573" />
+<TGConnectingPoint num="2" id="4574" />
+<TGConnectingPoint num="3" id="4575" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="4080" >
+<COMPONENT type="5103" id="4589" >
 <cdparam x="310" y="209" />
 <sizeparam width="34" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="CC()" />
-<TGConnectingPoint num="0" id="4070" />
-<TGConnectingPoint num="1" id="4071" />
-<TGConnectingPoint num="2" id="4072" />
-<TGConnectingPoint num="3" id="4073" />
-<TGConnectingPoint num="4" id="4074" />
-<TGConnectingPoint num="5" id="4075" />
-<TGConnectingPoint num="6" id="4076" />
-<TGConnectingPoint num="7" id="4077" />
-<TGConnectingPoint num="8" id="4078" />
-<TGConnectingPoint num="9" id="4079" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4091" >
+<TGConnectingPoint num="0" id="4579" />
+<TGConnectingPoint num="1" id="4580" />
+<TGConnectingPoint num="2" id="4581" />
+<TGConnectingPoint num="3" id="4582" />
+<TGConnectingPoint num="4" id="4583" />
+<TGConnectingPoint num="5" id="4584" />
+<TGConnectingPoint num="6" id="4585" />
+<TGConnectingPoint num="7" id="4586" />
+<TGConnectingPoint num="8" id="4587" />
+<TGConnectingPoint num="9" id="4588" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4600" >
 <cdparam x="285" y="150" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconresp()" />
-<TGConnectingPoint num="0" id="4081" />
-<TGConnectingPoint num="1" id="4082" />
-<TGConnectingPoint num="2" id="4083" />
-<TGConnectingPoint num="3" id="4084" />
-<TGConnectingPoint num="4" id="4085" />
-<TGConnectingPoint num="5" id="4086" />
-<TGConnectingPoint num="6" id="4087" />
-<TGConnectingPoint num="7" id="4088" />
-<TGConnectingPoint num="8" id="4089" />
-<TGConnectingPoint num="9" id="4090" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4132" >
+<TGConnectingPoint num="0" id="4590" />
+<TGConnectingPoint num="1" id="4591" />
+<TGConnectingPoint num="2" id="4592" />
+<TGConnectingPoint num="3" id="4593" />
+<TGConnectingPoint num="4" id="4594" />
+<TGConnectingPoint num="5" id="4595" />
+<TGConnectingPoint num="6" id="4596" />
+<TGConnectingPoint num="7" id="4597" />
+<TGConnectingPoint num="8" id="4598" />
+<TGConnectingPoint num="9" id="4599" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4673" >
 <cdparam x="253" y="69" />
 <sizeparam width="119" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_RESP" />
-<TGConnectingPoint num="0" id="4092" />
-<TGConnectingPoint num="1" id="4093" />
-<TGConnectingPoint num="2" id="4094" />
-<TGConnectingPoint num="3" id="4095" />
-<TGConnectingPoint num="4" id="4096" />
-<TGConnectingPoint num="5" id="4097" />
-<TGConnectingPoint num="6" id="4098" />
-<TGConnectingPoint num="7" id="4099" />
-<TGConnectingPoint num="8" id="4100" />
-<TGConnectingPoint num="9" id="4101" />
-<TGConnectingPoint num="10" id="4102" />
-<TGConnectingPoint num="11" id="4103" />
-<TGConnectingPoint num="12" id="4104" />
-<TGConnectingPoint num="13" id="4105" />
-<TGConnectingPoint num="14" id="4106" />
-<TGConnectingPoint num="15" id="4107" />
-<TGConnectingPoint num="16" id="4108" />
-<TGConnectingPoint num="17" id="4109" />
-<TGConnectingPoint num="18" id="4110" />
-<TGConnectingPoint num="19" id="4111" />
-<TGConnectingPoint num="20" id="4112" />
-<TGConnectingPoint num="21" id="4113" />
-<TGConnectingPoint num="22" id="4114" />
-<TGConnectingPoint num="23" id="4115" />
-<TGConnectingPoint num="24" id="4116" />
-<TGConnectingPoint num="25" id="4117" />
-<TGConnectingPoint num="26" id="4118" />
-<TGConnectingPoint num="27" id="4119" />
-<TGConnectingPoint num="28" id="4120" />
-<TGConnectingPoint num="29" id="4121" />
-<TGConnectingPoint num="30" id="4122" />
-<TGConnectingPoint num="31" id="4123" />
-<TGConnectingPoint num="32" id="4124" />
-<TGConnectingPoint num="33" id="4125" />
-<TGConnectingPoint num="34" id="4126" />
-<TGConnectingPoint num="35" id="4127" />
-<TGConnectingPoint num="36" id="4128" />
-<TGConnectingPoint num="37" id="4129" />
-<TGConnectingPoint num="38" id="4130" />
-<TGConnectingPoint num="39" id="4131" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4173" >
+<TGConnectingPoint num="0" id="4601" />
+<TGConnectingPoint num="1" id="4602" />
+<TGConnectingPoint num="2" id="4603" />
+<TGConnectingPoint num="3" id="4604" />
+<TGConnectingPoint num="4" id="4605" />
+<TGConnectingPoint num="5" id="4606" />
+<TGConnectingPoint num="6" id="4607" />
+<TGConnectingPoint num="7" id="4608" />
+<TGConnectingPoint num="8" id="4609" />
+<TGConnectingPoint num="9" id="4610" />
+<TGConnectingPoint num="10" id="4611" />
+<TGConnectingPoint num="11" id="4612" />
+<TGConnectingPoint num="12" id="4613" />
+<TGConnectingPoint num="13" id="4614" />
+<TGConnectingPoint num="14" id="4615" />
+<TGConnectingPoint num="15" id="4616" />
+<TGConnectingPoint num="16" id="4617" />
+<TGConnectingPoint num="17" id="4618" />
+<TGConnectingPoint num="18" id="4619" />
+<TGConnectingPoint num="19" id="4620" />
+<TGConnectingPoint num="20" id="4621" />
+<TGConnectingPoint num="21" id="4622" />
+<TGConnectingPoint num="22" id="4623" />
+<TGConnectingPoint num="23" id="4624" />
+<TGConnectingPoint num="24" id="4625" />
+<TGConnectingPoint num="25" id="4626" />
+<TGConnectingPoint num="26" id="4627" />
+<TGConnectingPoint num="27" id="4628" />
+<TGConnectingPoint num="28" id="4629" />
+<TGConnectingPoint num="29" id="4630" />
+<TGConnectingPoint num="30" id="4631" />
+<TGConnectingPoint num="31" id="4632" />
+<TGConnectingPoint num="32" id="4633" />
+<TGConnectingPoint num="33" id="4634" />
+<TGConnectingPoint num="34" id="4635" />
+<TGConnectingPoint num="35" id="4636" />
+<TGConnectingPoint num="36" id="4637" />
+<TGConnectingPoint num="37" id="4638" />
+<TGConnectingPoint num="38" id="4639" />
+<TGConnectingPoint num="39" id="4640" />
+<TGConnectingPoint num="40" id="4641" />
+<TGConnectingPoint num="41" id="4642" />
+<TGConnectingPoint num="42" id="4643" />
+<TGConnectingPoint num="43" id="4644" />
+<TGConnectingPoint num="44" id="4645" />
+<TGConnectingPoint num="45" id="4646" />
+<TGConnectingPoint num="46" id="4647" />
+<TGConnectingPoint num="47" id="4648" />
+<TGConnectingPoint num="48" id="4649" />
+<TGConnectingPoint num="49" id="4650" />
+<TGConnectingPoint num="50" id="4651" />
+<TGConnectingPoint num="51" id="4652" />
+<TGConnectingPoint num="52" id="4653" />
+<TGConnectingPoint num="53" id="4654" />
+<TGConnectingPoint num="54" id="4655" />
+<TGConnectingPoint num="55" id="4656" />
+<TGConnectingPoint num="56" id="4657" />
+<TGConnectingPoint num="57" id="4658" />
+<TGConnectingPoint num="58" id="4659" />
+<TGConnectingPoint num="59" id="4660" />
+<TGConnectingPoint num="60" id="4661" />
+<TGConnectingPoint num="61" id="4662" />
+<TGConnectingPoint num="62" id="4663" />
+<TGConnectingPoint num="63" id="4664" />
+<TGConnectingPoint num="64" id="4665" />
+<TGConnectingPoint num="65" id="4666" />
+<TGConnectingPoint num="66" id="4667" />
+<TGConnectingPoint num="67" id="4668" />
+<TGConnectingPoint num="68" id="4669" />
+<TGConnectingPoint num="69" id="4670" />
+<TGConnectingPoint num="70" id="4671" />
+<TGConnectingPoint num="71" id="4672" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="4746" >
 <cdparam x="39" y="262" />
 <sizeparam width="121" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="WAIT_FOR_RESP" />
-<TGConnectingPoint num="0" id="4133" />
-<TGConnectingPoint num="1" id="4134" />
-<TGConnectingPoint num="2" id="4135" />
-<TGConnectingPoint num="3" id="4136" />
-<TGConnectingPoint num="4" id="4137" />
-<TGConnectingPoint num="5" id="4138" />
-<TGConnectingPoint num="6" id="4139" />
-<TGConnectingPoint num="7" id="4140" />
-<TGConnectingPoint num="8" id="4141" />
-<TGConnectingPoint num="9" id="4142" />
-<TGConnectingPoint num="10" id="4143" />
-<TGConnectingPoint num="11" id="4144" />
-<TGConnectingPoint num="12" id="4145" />
-<TGConnectingPoint num="13" id="4146" />
-<TGConnectingPoint num="14" id="4147" />
-<TGConnectingPoint num="15" id="4148" />
-<TGConnectingPoint num="16" id="4149" />
-<TGConnectingPoint num="17" id="4150" />
-<TGConnectingPoint num="18" id="4151" />
-<TGConnectingPoint num="19" id="4152" />
-<TGConnectingPoint num="20" id="4153" />
-<TGConnectingPoint num="21" id="4154" />
-<TGConnectingPoint num="22" id="4155" />
-<TGConnectingPoint num="23" id="4156" />
-<TGConnectingPoint num="24" id="4157" />
-<TGConnectingPoint num="25" id="4158" />
-<TGConnectingPoint num="26" id="4159" />
-<TGConnectingPoint num="27" id="4160" />
-<TGConnectingPoint num="28" id="4161" />
-<TGConnectingPoint num="29" id="4162" />
-<TGConnectingPoint num="30" id="4163" />
-<TGConnectingPoint num="31" id="4164" />
-<TGConnectingPoint num="32" id="4165" />
-<TGConnectingPoint num="33" id="4166" />
-<TGConnectingPoint num="34" id="4167" />
-<TGConnectingPoint num="35" id="4168" />
-<TGConnectingPoint num="36" id="4169" />
-<TGConnectingPoint num="37" id="4170" />
-<TGConnectingPoint num="38" id="4171" />
-<TGConnectingPoint num="39" id="4172" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="4184" >
+<TGConnectingPoint num="0" id="4674" />
+<TGConnectingPoint num="1" id="4675" />
+<TGConnectingPoint num="2" id="4676" />
+<TGConnectingPoint num="3" id="4677" />
+<TGConnectingPoint num="4" id="4678" />
+<TGConnectingPoint num="5" id="4679" />
+<TGConnectingPoint num="6" id="4680" />
+<TGConnectingPoint num="7" id="4681" />
+<TGConnectingPoint num="8" id="4682" />
+<TGConnectingPoint num="9" id="4683" />
+<TGConnectingPoint num="10" id="4684" />
+<TGConnectingPoint num="11" id="4685" />
+<TGConnectingPoint num="12" id="4686" />
+<TGConnectingPoint num="13" id="4687" />
+<TGConnectingPoint num="14" id="4688" />
+<TGConnectingPoint num="15" id="4689" />
+<TGConnectingPoint num="16" id="4690" />
+<TGConnectingPoint num="17" id="4691" />
+<TGConnectingPoint num="18" id="4692" />
+<TGConnectingPoint num="19" id="4693" />
+<TGConnectingPoint num="20" id="4694" />
+<TGConnectingPoint num="21" id="4695" />
+<TGConnectingPoint num="22" id="4696" />
+<TGConnectingPoint num="23" id="4697" />
+<TGConnectingPoint num="24" id="4698" />
+<TGConnectingPoint num="25" id="4699" />
+<TGConnectingPoint num="26" id="4700" />
+<TGConnectingPoint num="27" id="4701" />
+<TGConnectingPoint num="28" id="4702" />
+<TGConnectingPoint num="29" id="4703" />
+<TGConnectingPoint num="30" id="4704" />
+<TGConnectingPoint num="31" id="4705" />
+<TGConnectingPoint num="32" id="4706" />
+<TGConnectingPoint num="33" id="4707" />
+<TGConnectingPoint num="34" id="4708" />
+<TGConnectingPoint num="35" id="4709" />
+<TGConnectingPoint num="36" id="4710" />
+<TGConnectingPoint num="37" id="4711" />
+<TGConnectingPoint num="38" id="4712" />
+<TGConnectingPoint num="39" id="4713" />
+<TGConnectingPoint num="40" id="4714" />
+<TGConnectingPoint num="41" id="4715" />
+<TGConnectingPoint num="42" id="4716" />
+<TGConnectingPoint num="43" id="4717" />
+<TGConnectingPoint num="44" id="4718" />
+<TGConnectingPoint num="45" id="4719" />
+<TGConnectingPoint num="46" id="4720" />
+<TGConnectingPoint num="47" id="4721" />
+<TGConnectingPoint num="48" id="4722" />
+<TGConnectingPoint num="49" id="4723" />
+<TGConnectingPoint num="50" id="4724" />
+<TGConnectingPoint num="51" id="4725" />
+<TGConnectingPoint num="52" id="4726" />
+<TGConnectingPoint num="53" id="4727" />
+<TGConnectingPoint num="54" id="4728" />
+<TGConnectingPoint num="55" id="4729" />
+<TGConnectingPoint num="56" id="4730" />
+<TGConnectingPoint num="57" id="4731" />
+<TGConnectingPoint num="58" id="4732" />
+<TGConnectingPoint num="59" id="4733" />
+<TGConnectingPoint num="60" id="4734" />
+<TGConnectingPoint num="61" id="4735" />
+<TGConnectingPoint num="62" id="4736" />
+<TGConnectingPoint num="63" id="4737" />
+<TGConnectingPoint num="64" id="4738" />
+<TGConnectingPoint num="65" id="4739" />
+<TGConnectingPoint num="66" id="4740" />
+<TGConnectingPoint num="67" id="4741" />
+<TGConnectingPoint num="68" id="4742" />
+<TGConnectingPoint num="69" id="4743" />
+<TGConnectingPoint num="70" id="4744" />
+<TGConnectingPoint num="71" id="4745" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="4757" >
 <cdparam x="65" y="212" />
 <sizeparam width="68" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconind()" />
-<TGConnectingPoint num="0" id="4174" />
-<TGConnectingPoint num="1" id="4175" />
-<TGConnectingPoint num="2" id="4176" />
-<TGConnectingPoint num="3" id="4177" />
-<TGConnectingPoint num="4" id="4178" />
-<TGConnectingPoint num="5" id="4179" />
-<TGConnectingPoint num="6" id="4180" />
-<TGConnectingPoint num="7" id="4181" />
-<TGConnectingPoint num="8" id="4182" />
-<TGConnectingPoint num="9" id="4183" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4195" >
+<TGConnectingPoint num="0" id="4747" />
+<TGConnectingPoint num="1" id="4748" />
+<TGConnectingPoint num="2" id="4749" />
+<TGConnectingPoint num="3" id="4750" />
+<TGConnectingPoint num="4" id="4751" />
+<TGConnectingPoint num="5" id="4752" />
+<TGConnectingPoint num="6" id="4753" />
+<TGConnectingPoint num="7" id="4754" />
+<TGConnectingPoint num="8" id="4755" />
+<TGConnectingPoint num="9" id="4756" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="4768" >
 <cdparam x="78" y="156" />
 <sizeparam width="42" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="CR()" />
-<TGConnectingPoint num="0" id="4185" />
-<TGConnectingPoint num="1" id="4186" />
-<TGConnectingPoint num="2" id="4187" />
-<TGConnectingPoint num="3" id="4188" />
-<TGConnectingPoint num="4" id="4189" />
-<TGConnectingPoint num="5" id="4190" />
-<TGConnectingPoint num="6" id="4191" />
-<TGConnectingPoint num="7" id="4192" />
-<TGConnectingPoint num="8" id="4193" />
-<TGConnectingPoint num="9" id="4194" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4236" >
+<TGConnectingPoint num="0" id="4758" />
+<TGConnectingPoint num="1" id="4759" />
+<TGConnectingPoint num="2" id="4760" />
+<TGConnectingPoint num="3" id="4761" />
+<TGConnectingPoint num="4" id="4762" />
+<TGConnectingPoint num="5" id="4763" />
+<TGConnectingPoint num="6" id="4764" />
+<TGConnectingPoint num="7" id="4765" />
+<TGConnectingPoint num="8" id="4766" />
+<TGConnectingPoint num="9" id="4767" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4841" >
 <cdparam x="37" y="72" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="IDLE" />
-<TGConnectingPoint num="0" id="4196" />
-<TGConnectingPoint num="1" id="4197" />
-<TGConnectingPoint num="2" id="4198" />
-<TGConnectingPoint num="3" id="4199" />
-<TGConnectingPoint num="4" id="4200" />
-<TGConnectingPoint num="5" id="4201" />
-<TGConnectingPoint num="6" id="4202" />
-<TGConnectingPoint num="7" id="4203" />
-<TGConnectingPoint num="8" id="4204" />
-<TGConnectingPoint num="9" id="4205" />
-<TGConnectingPoint num="10" id="4206" />
-<TGConnectingPoint num="11" id="4207" />
-<TGConnectingPoint num="12" id="4208" />
-<TGConnectingPoint num="13" id="4209" />
-<TGConnectingPoint num="14" id="4210" />
-<TGConnectingPoint num="15" id="4211" />
-<TGConnectingPoint num="16" id="4212" />
-<TGConnectingPoint num="17" id="4213" />
-<TGConnectingPoint num="18" id="4214" />
-<TGConnectingPoint num="19" id="4215" />
-<TGConnectingPoint num="20" id="4216" />
-<TGConnectingPoint num="21" id="4217" />
-<TGConnectingPoint num="22" id="4218" />
-<TGConnectingPoint num="23" id="4219" />
-<TGConnectingPoint num="24" id="4220" />
-<TGConnectingPoint num="25" id="4221" />
-<TGConnectingPoint num="26" id="4222" />
-<TGConnectingPoint num="27" id="4223" />
-<TGConnectingPoint num="28" id="4224" />
-<TGConnectingPoint num="29" id="4225" />
-<TGConnectingPoint num="30" id="4226" />
-<TGConnectingPoint num="31" id="4227" />
-<TGConnectingPoint num="32" id="4228" />
-<TGConnectingPoint num="33" id="4229" />
-<TGConnectingPoint num="34" id="4230" />
-<TGConnectingPoint num="35" id="4231" />
-<TGConnectingPoint num="36" id="4232" />
-<TGConnectingPoint num="37" id="4233" />
-<TGConnectingPoint num="38" id="4234" />
-<TGConnectingPoint num="39" id="4235" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4238" >
+<TGConnectingPoint num="0" id="4769" />
+<TGConnectingPoint num="1" id="4770" />
+<TGConnectingPoint num="2" id="4771" />
+<TGConnectingPoint num="3" id="4772" />
+<TGConnectingPoint num="4" id="4773" />
+<TGConnectingPoint num="5" id="4774" />
+<TGConnectingPoint num="6" id="4775" />
+<TGConnectingPoint num="7" id="4776" />
+<TGConnectingPoint num="8" id="4777" />
+<TGConnectingPoint num="9" id="4778" />
+<TGConnectingPoint num="10" id="4779" />
+<TGConnectingPoint num="11" id="4780" />
+<TGConnectingPoint num="12" id="4781" />
+<TGConnectingPoint num="13" id="4782" />
+<TGConnectingPoint num="14" id="4783" />
+<TGConnectingPoint num="15" id="4784" />
+<TGConnectingPoint num="16" id="4785" />
+<TGConnectingPoint num="17" id="4786" />
+<TGConnectingPoint num="18" id="4787" />
+<TGConnectingPoint num="19" id="4788" />
+<TGConnectingPoint num="20" id="4789" />
+<TGConnectingPoint num="21" id="4790" />
+<TGConnectingPoint num="22" id="4791" />
+<TGConnectingPoint num="23" id="4792" />
+<TGConnectingPoint num="24" id="4793" />
+<TGConnectingPoint num="25" id="4794" />
+<TGConnectingPoint num="26" id="4795" />
+<TGConnectingPoint num="27" id="4796" />
+<TGConnectingPoint num="28" id="4797" />
+<TGConnectingPoint num="29" id="4798" />
+<TGConnectingPoint num="30" id="4799" />
+<TGConnectingPoint num="31" id="4800" />
+<TGConnectingPoint num="32" id="4801" />
+<TGConnectingPoint num="33" id="4802" />
+<TGConnectingPoint num="34" id="4803" />
+<TGConnectingPoint num="35" id="4804" />
+<TGConnectingPoint num="36" id="4805" />
+<TGConnectingPoint num="37" id="4806" />
+<TGConnectingPoint num="38" id="4807" />
+<TGConnectingPoint num="39" id="4808" />
+<TGConnectingPoint num="40" id="4809" />
+<TGConnectingPoint num="41" id="4810" />
+<TGConnectingPoint num="42" id="4811" />
+<TGConnectingPoint num="43" id="4812" />
+<TGConnectingPoint num="44" id="4813" />
+<TGConnectingPoint num="45" id="4814" />
+<TGConnectingPoint num="46" id="4815" />
+<TGConnectingPoint num="47" id="4816" />
+<TGConnectingPoint num="48" id="4817" />
+<TGConnectingPoint num="49" id="4818" />
+<TGConnectingPoint num="50" id="4819" />
+<TGConnectingPoint num="51" id="4820" />
+<TGConnectingPoint num="52" id="4821" />
+<TGConnectingPoint num="53" id="4822" />
+<TGConnectingPoint num="54" id="4823" />
+<TGConnectingPoint num="55" id="4824" />
+<TGConnectingPoint num="56" id="4825" />
+<TGConnectingPoint num="57" id="4826" />
+<TGConnectingPoint num="58" id="4827" />
+<TGConnectingPoint num="59" id="4828" />
+<TGConnectingPoint num="60" id="4829" />
+<TGConnectingPoint num="61" id="4830" />
+<TGConnectingPoint num="62" id="4831" />
+<TGConnectingPoint num="63" id="4832" />
+<TGConnectingPoint num="64" id="4833" />
+<TGConnectingPoint num="65" id="4834" />
+<TGConnectingPoint num="66" id="4835" />
+<TGConnectingPoint num="67" id="4836" />
+<TGConnectingPoint num="68" id="4837" />
+<TGConnectingPoint num="69" id="4838" />
+<TGConnectingPoint num="70" id="4839" />
+<TGConnectingPoint num="71" id="4840" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="4843" >
 <cdparam x="68" y="27" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4237" />
+<TGConnectingPoint num="0" id="4842" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="4249" >
+<COMPONENT type="5104" id="4854" >
 <cdparam x="469" y="148" />
 <sizeparam width="43" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="DR()" />
-<TGConnectingPoint num="0" id="4239" />
-<TGConnectingPoint num="1" id="4240" />
-<TGConnectingPoint num="2" id="4241" />
-<TGConnectingPoint num="3" id="4242" />
-<TGConnectingPoint num="4" id="4243" />
-<TGConnectingPoint num="5" id="4244" />
-<TGConnectingPoint num="6" id="4245" />
-<TGConnectingPoint num="7" id="4246" />
-<TGConnectingPoint num="8" id="4247" />
-<TGConnectingPoint num="9" id="4248" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="4260" >
+<TGConnectingPoint num="0" id="4844" />
+<TGConnectingPoint num="1" id="4845" />
+<TGConnectingPoint num="2" id="4846" />
+<TGConnectingPoint num="3" id="4847" />
+<TGConnectingPoint num="4" id="4848" />
+<TGConnectingPoint num="5" id="4849" />
+<TGConnectingPoint num="6" id="4850" />
+<TGConnectingPoint num="7" id="4851" />
+<TGConnectingPoint num="8" id="4852" />
+<TGConnectingPoint num="9" id="4853" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="4865" >
 <cdparam x="437" y="202" />
 <sizeparam width="106" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INerror_ground()" />
-<TGConnectingPoint num="0" id="4250" />
-<TGConnectingPoint num="1" id="4251" />
-<TGConnectingPoint num="2" id="4252" />
-<TGConnectingPoint num="3" id="4253" />
-<TGConnectingPoint num="4" id="4254" />
-<TGConnectingPoint num="5" id="4255" />
-<TGConnectingPoint num="6" id="4256" />
-<TGConnectingPoint num="7" id="4257" />
-<TGConnectingPoint num="8" id="4258" />
-<TGConnectingPoint num="9" id="4259" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4301" >
+<TGConnectingPoint num="0" id="4855" />
+<TGConnectingPoint num="1" id="4856" />
+<TGConnectingPoint num="2" id="4857" />
+<TGConnectingPoint num="3" id="4858" />
+<TGConnectingPoint num="4" id="4859" />
+<TGConnectingPoint num="5" id="4860" />
+<TGConnectingPoint num="6" id="4861" />
+<TGConnectingPoint num="7" id="4862" />
+<TGConnectingPoint num="8" id="4863" />
+<TGConnectingPoint num="9" id="4864" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4938" >
 <cdparam x="440" y="255" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="ERROR" />
-<TGConnectingPoint num="0" id="4261" />
-<TGConnectingPoint num="1" id="4262" />
-<TGConnectingPoint num="2" id="4263" />
-<TGConnectingPoint num="3" id="4264" />
-<TGConnectingPoint num="4" id="4265" />
-<TGConnectingPoint num="5" id="4266" />
-<TGConnectingPoint num="6" id="4267" />
-<TGConnectingPoint num="7" id="4268" />
-<TGConnectingPoint num="8" id="4269" />
-<TGConnectingPoint num="9" id="4270" />
-<TGConnectingPoint num="10" id="4271" />
-<TGConnectingPoint num="11" id="4272" />
-<TGConnectingPoint num="12" id="4273" />
-<TGConnectingPoint num="13" id="4274" />
-<TGConnectingPoint num="14" id="4275" />
-<TGConnectingPoint num="15" id="4276" />
-<TGConnectingPoint num="16" id="4277" />
-<TGConnectingPoint num="17" id="4278" />
-<TGConnectingPoint num="18" id="4279" />
-<TGConnectingPoint num="19" id="4280" />
-<TGConnectingPoint num="20" id="4281" />
-<TGConnectingPoint num="21" id="4282" />
-<TGConnectingPoint num="22" id="4283" />
-<TGConnectingPoint num="23" id="4284" />
-<TGConnectingPoint num="24" id="4285" />
-<TGConnectingPoint num="25" id="4286" />
-<TGConnectingPoint num="26" id="4287" />
-<TGConnectingPoint num="27" id="4288" />
-<TGConnectingPoint num="28" id="4289" />
-<TGConnectingPoint num="29" id="4290" />
-<TGConnectingPoint num="30" id="4291" />
-<TGConnectingPoint num="31" id="4292" />
-<TGConnectingPoint num="32" id="4293" />
-<TGConnectingPoint num="33" id="4294" />
-<TGConnectingPoint num="34" id="4295" />
-<TGConnectingPoint num="35" id="4296" />
-<TGConnectingPoint num="36" id="4297" />
-<TGConnectingPoint num="37" id="4298" />
-<TGConnectingPoint num="38" id="4299" />
-<TGConnectingPoint num="39" id="4300" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4342" >
+<TGConnectingPoint num="0" id="4866" />
+<TGConnectingPoint num="1" id="4867" />
+<TGConnectingPoint num="2" id="4868" />
+<TGConnectingPoint num="3" id="4869" />
+<TGConnectingPoint num="4" id="4870" />
+<TGConnectingPoint num="5" id="4871" />
+<TGConnectingPoint num="6" id="4872" />
+<TGConnectingPoint num="7" id="4873" />
+<TGConnectingPoint num="8" id="4874" />
+<TGConnectingPoint num="9" id="4875" />
+<TGConnectingPoint num="10" id="4876" />
+<TGConnectingPoint num="11" id="4877" />
+<TGConnectingPoint num="12" id="4878" />
+<TGConnectingPoint num="13" id="4879" />
+<TGConnectingPoint num="14" id="4880" />
+<TGConnectingPoint num="15" id="4881" />
+<TGConnectingPoint num="16" id="4882" />
+<TGConnectingPoint num="17" id="4883" />
+<TGConnectingPoint num="18" id="4884" />
+<TGConnectingPoint num="19" id="4885" />
+<TGConnectingPoint num="20" id="4886" />
+<TGConnectingPoint num="21" id="4887" />
+<TGConnectingPoint num="22" id="4888" />
+<TGConnectingPoint num="23" id="4889" />
+<TGConnectingPoint num="24" id="4890" />
+<TGConnectingPoint num="25" id="4891" />
+<TGConnectingPoint num="26" id="4892" />
+<TGConnectingPoint num="27" id="4893" />
+<TGConnectingPoint num="28" id="4894" />
+<TGConnectingPoint num="29" id="4895" />
+<TGConnectingPoint num="30" id="4896" />
+<TGConnectingPoint num="31" id="4897" />
+<TGConnectingPoint num="32" id="4898" />
+<TGConnectingPoint num="33" id="4899" />
+<TGConnectingPoint num="34" id="4900" />
+<TGConnectingPoint num="35" id="4901" />
+<TGConnectingPoint num="36" id="4902" />
+<TGConnectingPoint num="37" id="4903" />
+<TGConnectingPoint num="38" id="4904" />
+<TGConnectingPoint num="39" id="4905" />
+<TGConnectingPoint num="40" id="4906" />
+<TGConnectingPoint num="41" id="4907" />
+<TGConnectingPoint num="42" id="4908" />
+<TGConnectingPoint num="43" id="4909" />
+<TGConnectingPoint num="44" id="4910" />
+<TGConnectingPoint num="45" id="4911" />
+<TGConnectingPoint num="46" id="4912" />
+<TGConnectingPoint num="47" id="4913" />
+<TGConnectingPoint num="48" id="4914" />
+<TGConnectingPoint num="49" id="4915" />
+<TGConnectingPoint num="50" id="4916" />
+<TGConnectingPoint num="51" id="4917" />
+<TGConnectingPoint num="52" id="4918" />
+<TGConnectingPoint num="53" id="4919" />
+<TGConnectingPoint num="54" id="4920" />
+<TGConnectingPoint num="55" id="4921" />
+<TGConnectingPoint num="56" id="4922" />
+<TGConnectingPoint num="57" id="4923" />
+<TGConnectingPoint num="58" id="4924" />
+<TGConnectingPoint num="59" id="4925" />
+<TGConnectingPoint num="60" id="4926" />
+<TGConnectingPoint num="61" id="4927" />
+<TGConnectingPoint num="62" id="4928" />
+<TGConnectingPoint num="63" id="4929" />
+<TGConnectingPoint num="64" id="4930" />
+<TGConnectingPoint num="65" id="4931" />
+<TGConnectingPoint num="66" id="4932" />
+<TGConnectingPoint num="67" id="4933" />
+<TGConnectingPoint num="68" id="4934" />
+<TGConnectingPoint num="69" id="4935" />
+<TGConnectingPoint num="70" id="4936" />
+<TGConnectingPoint num="71" id="4937" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5011" >
 <cdparam x="440" y="63" />
 <sizeparam width="100" height="59" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="CONNECTED" />
-<TGConnectingPoint num="0" id="4302" />
-<TGConnectingPoint num="1" id="4303" />
-<TGConnectingPoint num="2" id="4304" />
-<TGConnectingPoint num="3" id="4305" />
-<TGConnectingPoint num="4" id="4306" />
-<TGConnectingPoint num="5" id="4307" />
-<TGConnectingPoint num="6" id="4308" />
-<TGConnectingPoint num="7" id="4309" />
-<TGConnectingPoint num="8" id="4310" />
-<TGConnectingPoint num="9" id="4311" />
-<TGConnectingPoint num="10" id="4312" />
-<TGConnectingPoint num="11" id="4313" />
-<TGConnectingPoint num="12" id="4314" />
-<TGConnectingPoint num="13" id="4315" />
-<TGConnectingPoint num="14" id="4316" />
-<TGConnectingPoint num="15" id="4317" />
-<TGConnectingPoint num="16" id="4318" />
-<TGConnectingPoint num="17" id="4319" />
-<TGConnectingPoint num="18" id="4320" />
-<TGConnectingPoint num="19" id="4321" />
-<TGConnectingPoint num="20" id="4322" />
-<TGConnectingPoint num="21" id="4323" />
-<TGConnectingPoint num="22" id="4324" />
-<TGConnectingPoint num="23" id="4325" />
-<TGConnectingPoint num="24" id="4326" />
-<TGConnectingPoint num="25" id="4327" />
-<TGConnectingPoint num="26" id="4328" />
-<TGConnectingPoint num="27" id="4329" />
-<TGConnectingPoint num="28" id="4330" />
-<TGConnectingPoint num="29" id="4331" />
-<TGConnectingPoint num="30" id="4332" />
-<TGConnectingPoint num="31" id="4333" />
-<TGConnectingPoint num="32" id="4334" />
-<TGConnectingPoint num="33" id="4335" />
-<TGConnectingPoint num="34" id="4336" />
-<TGConnectingPoint num="35" id="4337" />
-<TGConnectingPoint num="36" id="4338" />
-<TGConnectingPoint num="37" id="4339" />
-<TGConnectingPoint num="38" id="4340" />
-<TGConnectingPoint num="39" id="4341" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="4383" >
+<TGConnectingPoint num="0" id="4939" />
+<TGConnectingPoint num="1" id="4940" />
+<TGConnectingPoint num="2" id="4941" />
+<TGConnectingPoint num="3" id="4942" />
+<TGConnectingPoint num="4" id="4943" />
+<TGConnectingPoint num="5" id="4944" />
+<TGConnectingPoint num="6" id="4945" />
+<TGConnectingPoint num="7" id="4946" />
+<TGConnectingPoint num="8" id="4947" />
+<TGConnectingPoint num="9" id="4948" />
+<TGConnectingPoint num="10" id="4949" />
+<TGConnectingPoint num="11" id="4950" />
+<TGConnectingPoint num="12" id="4951" />
+<TGConnectingPoint num="13" id="4952" />
+<TGConnectingPoint num="14" id="4953" />
+<TGConnectingPoint num="15" id="4954" />
+<TGConnectingPoint num="16" id="4955" />
+<TGConnectingPoint num="17" id="4956" />
+<TGConnectingPoint num="18" id="4957" />
+<TGConnectingPoint num="19" id="4958" />
+<TGConnectingPoint num="20" id="4959" />
+<TGConnectingPoint num="21" id="4960" />
+<TGConnectingPoint num="22" id="4961" />
+<TGConnectingPoint num="23" id="4962" />
+<TGConnectingPoint num="24" id="4963" />
+<TGConnectingPoint num="25" id="4964" />
+<TGConnectingPoint num="26" id="4965" />
+<TGConnectingPoint num="27" id="4966" />
+<TGConnectingPoint num="28" id="4967" />
+<TGConnectingPoint num="29" id="4968" />
+<TGConnectingPoint num="30" id="4969" />
+<TGConnectingPoint num="31" id="4970" />
+<TGConnectingPoint num="32" id="4971" />
+<TGConnectingPoint num="33" id="4972" />
+<TGConnectingPoint num="34" id="4973" />
+<TGConnectingPoint num="35" id="4974" />
+<TGConnectingPoint num="36" id="4975" />
+<TGConnectingPoint num="37" id="4976" />
+<TGConnectingPoint num="38" id="4977" />
+<TGConnectingPoint num="39" id="4978" />
+<TGConnectingPoint num="40" id="4979" />
+<TGConnectingPoint num="41" id="4980" />
+<TGConnectingPoint num="42" id="4981" />
+<TGConnectingPoint num="43" id="4982" />
+<TGConnectingPoint num="44" id="4983" />
+<TGConnectingPoint num="45" id="4984" />
+<TGConnectingPoint num="46" id="4985" />
+<TGConnectingPoint num="47" id="4986" />
+<TGConnectingPoint num="48" id="4987" />
+<TGConnectingPoint num="49" id="4988" />
+<TGConnectingPoint num="50" id="4989" />
+<TGConnectingPoint num="51" id="4990" />
+<TGConnectingPoint num="52" id="4991" />
+<TGConnectingPoint num="53" id="4992" />
+<TGConnectingPoint num="54" id="4993" />
+<TGConnectingPoint num="55" id="4994" />
+<TGConnectingPoint num="56" id="4995" />
+<TGConnectingPoint num="57" id="4996" />
+<TGConnectingPoint num="58" id="4997" />
+<TGConnectingPoint num="59" id="4998" />
+<TGConnectingPoint num="60" id="4999" />
+<TGConnectingPoint num="61" id="5000" />
+<TGConnectingPoint num="62" id="5001" />
+<TGConnectingPoint num="63" id="5002" />
+<TGConnectingPoint num="64" id="5003" />
+<TGConnectingPoint num="65" id="5004" />
+<TGConnectingPoint num="66" id="5005" />
+<TGConnectingPoint num="67" id="5006" />
+<TGConnectingPoint num="68" id="5007" />
+<TGConnectingPoint num="69" id="5008" />
+<TGConnectingPoint num="70" id="5009" />
+<TGConnectingPoint num="71" id="5010" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5084" >
 <cdparam x="277" y="266" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="State" value="CONNECTED" />
-<TGConnectingPoint num="0" id="4343" />
-<TGConnectingPoint num="1" id="4344" />
-<TGConnectingPoint num="2" id="4345" />
-<TGConnectingPoint num="3" id="4346" />
-<TGConnectingPoint num="4" id="4347" />
-<TGConnectingPoint num="5" id="4348" />
-<TGConnectingPoint num="6" id="4349" />
-<TGConnectingPoint num="7" id="4350" />
-<TGConnectingPoint num="8" id="4351" />
-<TGConnectingPoint num="9" id="4352" />
-<TGConnectingPoint num="10" id="4353" />
-<TGConnectingPoint num="11" id="4354" />
-<TGConnectingPoint num="12" id="4355" />
-<TGConnectingPoint num="13" id="4356" />
-<TGConnectingPoint num="14" id="4357" />
-<TGConnectingPoint num="15" id="4358" />
-<TGConnectingPoint num="16" id="4359" />
-<TGConnectingPoint num="17" id="4360" />
-<TGConnectingPoint num="18" id="4361" />
-<TGConnectingPoint num="19" id="4362" />
-<TGConnectingPoint num="20" id="4363" />
-<TGConnectingPoint num="21" id="4364" />
-<TGConnectingPoint num="22" id="4365" />
-<TGConnectingPoint num="23" id="4366" />
-<TGConnectingPoint num="24" id="4367" />
-<TGConnectingPoint num="25" id="4368" />
-<TGConnectingPoint num="26" id="4369" />
-<TGConnectingPoint num="27" id="4370" />
-<TGConnectingPoint num="28" id="4371" />
-<TGConnectingPoint num="29" id="4372" />
-<TGConnectingPoint num="30" id="4373" />
-<TGConnectingPoint num="31" id="4374" />
-<TGConnectingPoint num="32" id="4375" />
-<TGConnectingPoint num="33" id="4376" />
-<TGConnectingPoint num="34" id="4377" />
-<TGConnectingPoint num="35" id="4378" />
-<TGConnectingPoint num="36" id="4379" />
-<TGConnectingPoint num="37" id="4380" />
-<TGConnectingPoint num="38" id="4381" />
-<TGConnectingPoint num="39" id="4382" />
+<TGConnectingPoint num="0" id="5012" />
+<TGConnectingPoint num="1" id="5013" />
+<TGConnectingPoint num="2" id="5014" />
+<TGConnectingPoint num="3" id="5015" />
+<TGConnectingPoint num="4" id="5016" />
+<TGConnectingPoint num="5" id="5017" />
+<TGConnectingPoint num="6" id="5018" />
+<TGConnectingPoint num="7" id="5019" />
+<TGConnectingPoint num="8" id="5020" />
+<TGConnectingPoint num="9" id="5021" />
+<TGConnectingPoint num="10" id="5022" />
+<TGConnectingPoint num="11" id="5023" />
+<TGConnectingPoint num="12" id="5024" />
+<TGConnectingPoint num="13" id="5025" />
+<TGConnectingPoint num="14" id="5026" />
+<TGConnectingPoint num="15" id="5027" />
+<TGConnectingPoint num="16" id="5028" />
+<TGConnectingPoint num="17" id="5029" />
+<TGConnectingPoint num="18" id="5030" />
+<TGConnectingPoint num="19" id="5031" />
+<TGConnectingPoint num="20" id="5032" />
+<TGConnectingPoint num="21" id="5033" />
+<TGConnectingPoint num="22" id="5034" />
+<TGConnectingPoint num="23" id="5035" />
+<TGConnectingPoint num="24" id="5036" />
+<TGConnectingPoint num="25" id="5037" />
+<TGConnectingPoint num="26" id="5038" />
+<TGConnectingPoint num="27" id="5039" />
+<TGConnectingPoint num="28" id="5040" />
+<TGConnectingPoint num="29" id="5041" />
+<TGConnectingPoint num="30" id="5042" />
+<TGConnectingPoint num="31" id="5043" />
+<TGConnectingPoint num="32" id="5044" />
+<TGConnectingPoint num="33" id="5045" />
+<TGConnectingPoint num="34" id="5046" />
+<TGConnectingPoint num="35" id="5047" />
+<TGConnectingPoint num="36" id="5048" />
+<TGConnectingPoint num="37" id="5049" />
+<TGConnectingPoint num="38" id="5050" />
+<TGConnectingPoint num="39" id="5051" />
+<TGConnectingPoint num="40" id="5052" />
+<TGConnectingPoint num="41" id="5053" />
+<TGConnectingPoint num="42" id="5054" />
+<TGConnectingPoint num="43" id="5055" />
+<TGConnectingPoint num="44" id="5056" />
+<TGConnectingPoint num="45" id="5057" />
+<TGConnectingPoint num="46" id="5058" />
+<TGConnectingPoint num="47" id="5059" />
+<TGConnectingPoint num="48" id="5060" />
+<TGConnectingPoint num="49" id="5061" />
+<TGConnectingPoint num="50" id="5062" />
+<TGConnectingPoint num="51" id="5063" />
+<TGConnectingPoint num="52" id="5064" />
+<TGConnectingPoint num="53" id="5065" />
+<TGConnectingPoint num="54" id="5066" />
+<TGConnectingPoint num="55" id="5067" />
+<TGConnectingPoint num="56" id="5068" />
+<TGConnectingPoint num="57" id="5069" />
+<TGConnectingPoint num="58" id="5070" />
+<TGConnectingPoint num="59" id="5071" />
+<TGConnectingPoint num="60" id="5072" />
+<TGConnectingPoint num="61" id="5073" />
+<TGConnectingPoint num="62" id="5074" />
+<TGConnectingPoint num="63" id="5075" />
+<TGConnectingPoint num="64" id="5076" />
+<TGConnectingPoint num="65" id="5077" />
+<TGConnectingPoint num="66" id="5078" />
+<TGConnectingPoint num="67" id="5079" />
+<TGConnectingPoint num="68" id="5080" />
+<TGConnectingPoint num="69" id="5081" />
+<TGConnectingPoint num="70" id="5082" />
+<TGConnectingPoint num="71" id="5083" />
 <extraparam>
 </extraparam>
 </COMPONENT>
@@ -8247,860 +9053,952 @@ CC is lost
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Controller" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4398" >
+<CONNECTOR type="5102" id="5099" >
 <cdparam x="374" y="197" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4393" />
-<TGConnectingPoint num="1" id="4394" />
-<TGConnectingPoint num="2" id="4395" />
-<TGConnectingPoint num="3" id="4396" />
-<TGConnectingPoint num="4" id="4397" />
-<P1  x="374" y="197" id="4456" />
-<P2  x="248" y="96" id="4507" />
+<TGConnectingPoint num="0" id="5094" />
+<TGConnectingPoint num="1" id="5095" />
+<TGConnectingPoint num="2" id="5096" />
+<TGConnectingPoint num="3" id="5097" />
+<TGConnectingPoint num="4" id="5098" />
+<P1  x="374" y="197" id="5157" />
+<P2  x="248" y="96" id="5208" />
 <Point x="374" y="212" />
 <Point x="441" y="212" />
 <Point x="441" y="90" />
 <Point x="274" y="90" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4384" >
-<father id="4398" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5085" >
+<father id="5099" num="0" />
 <cdparam x="374" y="212" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4385" >
-<father id="4398" num="1" />
+<SUBCOMPONENT type="-1" id="5086" >
+<father id="5099" num="1" />
 <cdparam x="441" y="212" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4386" >
-<father id="4398" num="2" />
+<SUBCOMPONENT type="-1" id="5087" >
+<father id="5099" num="2" />
 <cdparam x="441" y="90" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4387" >
-<father id="4398" num="3" />
+<SUBCOMPONENT type="-1" id="5088" >
+<father id="5099" num="3" />
 <cdparam x="274" y="90" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4392" >
-<father id="4398" num="4" />
+<SUBCOMPONENT type="-1" id="5093" >
+<father id="5099" num="4" />
 <cdparam x="311" y="146" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4388" />
-<TGConnectingPoint num="1" id="4389" />
-<TGConnectingPoint num="2" id="4390" />
-<TGConnectingPoint num="3" id="4391" />
+<TGConnectingPoint num="0" id="5089" />
+<TGConnectingPoint num="1" id="5090" />
+<TGConnectingPoint num="2" id="5091" />
+<TGConnectingPoint num="3" id="5092" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4407" >
+<CONNECTOR type="5102" id="5108" >
 <cdparam x="261" y="102" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4405" />
-<TGConnectingPoint num="1" id="4406" />
-<P1  x="261" y="102" id="4510" />
-<P2  x="374" y="167" id="4455" />
+<TGConnectingPoint num="0" id="5106" />
+<TGConnectingPoint num="1" id="5107" />
+<P1  x="261" y="102" id="5211" />
+<P2  x="374" y="167" id="5156" />
 <Point x="374" y="102" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4399" >
-<father id="4407" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5100" >
+<father id="5108" num="0" />
 <cdparam x="374" y="102" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4404" >
-<father id="4407" num="1" />
+<SUBCOMPONENT type="-1" id="5105" >
+<father id="5108" num="1" />
 <cdparam x="321" y="99" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4400" />
-<TGConnectingPoint num="1" id="4401" />
-<TGConnectingPoint num="2" id="4402" />
-<TGConnectingPoint num="3" id="4403" />
+<TGConnectingPoint num="0" id="5101" />
+<TGConnectingPoint num="1" id="5102" />
+<TGConnectingPoint num="2" id="5103" />
+<TGConnectingPoint num="3" id="5104" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4420" >
+<CONNECTOR type="5102" id="5121" >
 <cdparam x="153" y="198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4416" />
-<TGConnectingPoint num="1" id="4417" />
-<TGConnectingPoint num="2" id="4418" />
-<TGConnectingPoint num="3" id="4419" />
-<P1  x="153" y="198" id="4478" />
-<P2  x="261" y="114" id="4511" />
+<TGConnectingPoint num="0" id="5117" />
+<TGConnectingPoint num="1" id="5118" />
+<TGConnectingPoint num="2" id="5119" />
+<TGConnectingPoint num="3" id="5120" />
+<P1  x="153" y="198" id="5179" />
+<P2  x="261" y="114" id="5212" />
 <Point x="153" y="216" />
 <Point x="309" y="216" />
 <Point x="309" y="114" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4408" >
-<father id="4420" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5109" >
+<father id="5121" num="0" />
 <cdparam x="153" y="216" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4409" >
-<father id="4420" num="1" />
+<SUBCOMPONENT type="-1" id="5110" >
+<father id="5121" num="1" />
 <cdparam x="309" y="216" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4410" >
-<father id="4420" num="2" />
+<SUBCOMPONENT type="-1" id="5111" >
+<father id="5121" num="2" />
 <cdparam x="309" y="114" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4415" >
-<father id="4420" num="3" />
+<SUBCOMPONENT type="-1" id="5116" >
+<father id="5121" num="3" />
 <cdparam x="153" y="238" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4411" />
-<TGConnectingPoint num="1" id="4412" />
-<TGConnectingPoint num="2" id="4413" />
-<TGConnectingPoint num="3" id="4414" />
+<TGConnectingPoint num="0" id="5112" />
+<TGConnectingPoint num="1" id="5113" />
+<TGConnectingPoint num="2" id="5114" />
+<TGConnectingPoint num="3" id="5115" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4433" >
+<CONNECTOR type="5102" id="5134" >
 <cdparam x="247" y="197" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4429" />
-<TGConnectingPoint num="1" id="4430" />
-<TGConnectingPoint num="2" id="4431" />
-<TGConnectingPoint num="3" id="4432" />
-<P1  x="247" y="197" id="4467" />
-<P2  x="261" y="133" id="4501" />
+<TGConnectingPoint num="0" id="5130" />
+<TGConnectingPoint num="1" id="5131" />
+<TGConnectingPoint num="2" id="5132" />
+<TGConnectingPoint num="3" id="5133" />
+<P1  x="247" y="197" id="5168" />
+<P2  x="261" y="133" id="5202" />
 <Point x="247" y="207" />
 <Point x="298" y="207" />
 <Point x="298" y="133" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4421" >
-<father id="4433" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5122" >
+<father id="5134" num="0" />
 <cdparam x="247" y="207" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4422" >
-<father id="4433" num="1" />
+<SUBCOMPONENT type="-1" id="5123" >
+<father id="5134" num="1" />
 <cdparam x="298" y="207" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4423" >
-<father id="4433" num="2" />
+<SUBCOMPONENT type="-1" id="5124" >
+<father id="5134" num="2" />
 <cdparam x="298" y="133" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4428" >
-<father id="4433" num="3" />
+<SUBCOMPONENT type="-1" id="5129" >
+<father id="5134" num="3" />
 <cdparam x="247" y="237" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4424" />
-<TGConnectingPoint num="1" id="4425" />
-<TGConnectingPoint num="2" id="4426" />
-<TGConnectingPoint num="3" id="4427" />
+<TGConnectingPoint num="0" id="5125" />
+<TGConnectingPoint num="1" id="5126" />
+<TGConnectingPoint num="2" id="5127" />
+<TGConnectingPoint num="3" id="5128" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4440" >
+<CONNECTOR type="5102" id="5141" >
 <cdparam x="186" y="62" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4439" />
-<P1  x="186" y="62" id="4529" />
-<P2  x="211" y="96" id="4489" />
+<TGConnectingPoint num="0" id="5140" />
+<P1  x="186" y="62" id="5262" />
+<P2  x="211" y="96" id="5190" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4438" >
-<father id="4440" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5139" >
+<father id="5141" num="0" />
 <cdparam x="211" y="104" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4434" />
-<TGConnectingPoint num="1" id="4435" />
-<TGConnectingPoint num="2" id="4436" />
-<TGConnectingPoint num="3" id="4437" />
+<TGConnectingPoint num="0" id="5135" />
+<TGConnectingPoint num="1" id="5136" />
+<TGConnectingPoint num="2" id="5137" />
+<TGConnectingPoint num="3" id="5138" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4447" >
+<CONNECTOR type="5102" id="5148" >
 <cdparam x="161" y="146" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4446" />
-<P1  x="186" y="146" id="4502" />
-<P2  x="153" y="168" id="4477" />
+<TGConnectingPoint num="0" id="5147" />
+<P1  x="186" y="146" id="5203" />
+<P2  x="153" y="168" id="5178" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4445" >
-<father id="4447" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5146" >
+<father id="5148" num="0" />
 <cdparam x="161" y="186" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4441" />
-<TGConnectingPoint num="1" id="4442" />
-<TGConnectingPoint num="2" id="4443" />
-<TGConnectingPoint num="3" id="4444" />
+<TGConnectingPoint num="0" id="5142" />
+<TGConnectingPoint num="1" id="5143" />
+<TGConnectingPoint num="2" id="5144" />
+<TGConnectingPoint num="3" id="5145" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4454" >
+<CONNECTOR type="5102" id="5155" >
 <cdparam x="211" y="201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4453" />
-<P1  x="236" y="146" id="4503" />
-<P2  x="247" y="167" id="4466" />
+<TGConnectingPoint num="0" id="5154" />
+<P1  x="236" y="146" id="5204" />
+<P2  x="247" y="167" id="5167" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4452" >
-<father id="4454" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5153" >
+<father id="5155" num="0" />
 <cdparam x="211" y="241" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4448" />
-<TGConnectingPoint num="1" id="4449" />
-<TGConnectingPoint num="2" id="4450" />
-<TGConnectingPoint num="3" id="4451" />
+<TGConnectingPoint num="0" id="5149" />
+<TGConnectingPoint num="1" id="5150" />
+<TGConnectingPoint num="2" id="5151" />
+<TGConnectingPoint num="3" id="5152" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="4465" >
+<COMPONENT type="5104" id="5166" >
 <cdparam x="317" y="172" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INerror_ground()" />
-<TGConnectingPoint num="0" id="4455" />
-<TGConnectingPoint num="1" id="4456" />
-<TGConnectingPoint num="2" id="4457" />
-<TGConnectingPoint num="3" id="4458" />
-<TGConnectingPoint num="4" id="4459" />
-<TGConnectingPoint num="5" id="4460" />
-<TGConnectingPoint num="6" id="4461" />
-<TGConnectingPoint num="7" id="4462" />
-<TGConnectingPoint num="8" id="4463" />
-<TGConnectingPoint num="9" id="4464" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="4476" >
+<TGConnectingPoint num="0" id="5156" />
+<TGConnectingPoint num="1" id="5157" />
+<TGConnectingPoint num="2" id="5158" />
+<TGConnectingPoint num="3" id="5159" />
+<TGConnectingPoint num="4" id="5160" />
+<TGConnectingPoint num="5" id="5161" />
+<TGConnectingPoint num="6" id="5162" />
+<TGConnectingPoint num="7" id="5163" />
+<TGConnectingPoint num="8" id="5164" />
+<TGConnectingPoint num="9" id="5165" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5177" >
 <cdparam x="209" y="172" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconresp()" />
-<TGConnectingPoint num="0" id="4466" />
-<TGConnectingPoint num="1" id="4467" />
-<TGConnectingPoint num="2" id="4468" />
-<TGConnectingPoint num="3" id="4469" />
-<TGConnectingPoint num="4" id="4470" />
-<TGConnectingPoint num="5" id="4471" />
-<TGConnectingPoint num="6" id="4472" />
-<TGConnectingPoint num="7" id="4473" />
-<TGConnectingPoint num="8" id="4474" />
-<TGConnectingPoint num="9" id="4475" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4487" >
+<TGConnectingPoint num="0" id="5167" />
+<TGConnectingPoint num="1" id="5168" />
+<TGConnectingPoint num="2" id="5169" />
+<TGConnectingPoint num="3" id="5170" />
+<TGConnectingPoint num="4" id="5171" />
+<TGConnectingPoint num="5" id="5172" />
+<TGConnectingPoint num="6" id="5173" />
+<TGConnectingPoint num="7" id="5174" />
+<TGConnectingPoint num="8" id="5175" />
+<TGConnectingPoint num="9" id="5176" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5188" >
 <cdparam x="115" y="173" />
 <sizeparam width="76" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconind()" />
-<TGConnectingPoint num="0" id="4477" />
-<TGConnectingPoint num="1" id="4478" />
-<TGConnectingPoint num="2" id="4479" />
-<TGConnectingPoint num="3" id="4480" />
-<TGConnectingPoint num="4" id="4481" />
-<TGConnectingPoint num="5" id="4482" />
-<TGConnectingPoint num="6" id="4483" />
-<TGConnectingPoint num="7" id="4484" />
-<TGConnectingPoint num="8" id="4485" />
-<TGConnectingPoint num="9" id="4486" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4528" >
+<TGConnectingPoint num="0" id="5178" />
+<TGConnectingPoint num="1" id="5179" />
+<TGConnectingPoint num="2" id="5180" />
+<TGConnectingPoint num="3" id="5181" />
+<TGConnectingPoint num="4" id="5182" />
+<TGConnectingPoint num="5" id="5183" />
+<TGConnectingPoint num="6" id="5184" />
+<TGConnectingPoint num="7" id="5185" />
+<TGConnectingPoint num="8" id="5186" />
+<TGConnectingPoint num="9" id="5187" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5261" >
 <cdparam x="161" y="96" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="ACTIVE" />
-<TGConnectingPoint num="0" id="4488" />
-<TGConnectingPoint num="1" id="4489" />
-<TGConnectingPoint num="2" id="4490" />
-<TGConnectingPoint num="3" id="4491" />
-<TGConnectingPoint num="4" id="4492" />
-<TGConnectingPoint num="5" id="4493" />
-<TGConnectingPoint num="6" id="4494" />
-<TGConnectingPoint num="7" id="4495" />
-<TGConnectingPoint num="8" id="4496" />
-<TGConnectingPoint num="9" id="4497" />
-<TGConnectingPoint num="10" id="4498" />
-<TGConnectingPoint num="11" id="4499" />
-<TGConnectingPoint num="12" id="4500" />
-<TGConnectingPoint num="13" id="4501" />
-<TGConnectingPoint num="14" id="4502" />
-<TGConnectingPoint num="15" id="4503" />
-<TGConnectingPoint num="16" id="4504" />
-<TGConnectingPoint num="17" id="4505" />
-<TGConnectingPoint num="18" id="4506" />
-<TGConnectingPoint num="19" id="4507" />
-<TGConnectingPoint num="20" id="4508" />
-<TGConnectingPoint num="21" id="4509" />
-<TGConnectingPoint num="22" id="4510" />
-<TGConnectingPoint num="23" id="4511" />
-<TGConnectingPoint num="24" id="4512" />
-<TGConnectingPoint num="25" id="4513" />
-<TGConnectingPoint num="26" id="4514" />
-<TGConnectingPoint num="27" id="4515" />
-<TGConnectingPoint num="28" id="4516" />
-<TGConnectingPoint num="29" id="4517" />
-<TGConnectingPoint num="30" id="4518" />
-<TGConnectingPoint num="31" id="4519" />
-<TGConnectingPoint num="32" id="4520" />
-<TGConnectingPoint num="33" id="4521" />
-<TGConnectingPoint num="34" id="4522" />
-<TGConnectingPoint num="35" id="4523" />
-<TGConnectingPoint num="36" id="4524" />
-<TGConnectingPoint num="37" id="4525" />
-<TGConnectingPoint num="38" id="4526" />
-<TGConnectingPoint num="39" id="4527" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="4530" >
+<TGConnectingPoint num="0" id="5189" />
+<TGConnectingPoint num="1" id="5190" />
+<TGConnectingPoint num="2" id="5191" />
+<TGConnectingPoint num="3" id="5192" />
+<TGConnectingPoint num="4" id="5193" />
+<TGConnectingPoint num="5" id="5194" />
+<TGConnectingPoint num="6" id="5195" />
+<TGConnectingPoint num="7" id="5196" />
+<TGConnectingPoint num="8" id="5197" />
+<TGConnectingPoint num="9" id="5198" />
+<TGConnectingPoint num="10" id="5199" />
+<TGConnectingPoint num="11" id="5200" />
+<TGConnectingPoint num="12" id="5201" />
+<TGConnectingPoint num="13" id="5202" />
+<TGConnectingPoint num="14" id="5203" />
+<TGConnectingPoint num="15" id="5204" />
+<TGConnectingPoint num="16" id="5205" />
+<TGConnectingPoint num="17" id="5206" />
+<TGConnectingPoint num="18" id="5207" />
+<TGConnectingPoint num="19" id="5208" />
+<TGConnectingPoint num="20" id="5209" />
+<TGConnectingPoint num="21" id="5210" />
+<TGConnectingPoint num="22" id="5211" />
+<TGConnectingPoint num="23" id="5212" />
+<TGConnectingPoint num="24" id="5213" />
+<TGConnectingPoint num="25" id="5214" />
+<TGConnectingPoint num="26" id="5215" />
+<TGConnectingPoint num="27" id="5216" />
+<TGConnectingPoint num="28" id="5217" />
+<TGConnectingPoint num="29" id="5218" />
+<TGConnectingPoint num="30" id="5219" />
+<TGConnectingPoint num="31" id="5220" />
+<TGConnectingPoint num="32" id="5221" />
+<TGConnectingPoint num="33" id="5222" />
+<TGConnectingPoint num="34" id="5223" />
+<TGConnectingPoint num="35" id="5224" />
+<TGConnectingPoint num="36" id="5225" />
+<TGConnectingPoint num="37" id="5226" />
+<TGConnectingPoint num="38" id="5227" />
+<TGConnectingPoint num="39" id="5228" />
+<TGConnectingPoint num="40" id="5229" />
+<TGConnectingPoint num="41" id="5230" />
+<TGConnectingPoint num="42" id="5231" />
+<TGConnectingPoint num="43" id="5232" />
+<TGConnectingPoint num="44" id="5233" />
+<TGConnectingPoint num="45" id="5234" />
+<TGConnectingPoint num="46" id="5235" />
+<TGConnectingPoint num="47" id="5236" />
+<TGConnectingPoint num="48" id="5237" />
+<TGConnectingPoint num="49" id="5238" />
+<TGConnectingPoint num="50" id="5239" />
+<TGConnectingPoint num="51" id="5240" />
+<TGConnectingPoint num="52" id="5241" />
+<TGConnectingPoint num="53" id="5242" />
+<TGConnectingPoint num="54" id="5243" />
+<TGConnectingPoint num="55" id="5244" />
+<TGConnectingPoint num="56" id="5245" />
+<TGConnectingPoint num="57" id="5246" />
+<TGConnectingPoint num="58" id="5247" />
+<TGConnectingPoint num="59" id="5248" />
+<TGConnectingPoint num="60" id="5249" />
+<TGConnectingPoint num="61" id="5250" />
+<TGConnectingPoint num="62" id="5251" />
+<TGConnectingPoint num="63" id="5252" />
+<TGConnectingPoint num="64" id="5253" />
+<TGConnectingPoint num="65" id="5254" />
+<TGConnectingPoint num="66" id="5255" />
+<TGConnectingPoint num="67" id="5256" />
+<TGConnectingPoint num="68" id="5257" />
+<TGConnectingPoint num="69" id="5258" />
+<TGConnectingPoint num="70" id="5259" />
+<TGConnectingPoint num="71" id="5260" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="5263" >
 <cdparam x="179" y="42" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4529" />
+<TGConnectingPoint num="0" id="5262" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="Pilot" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="4543" >
+<CONNECTOR type="5102" id="5276" >
 <cdparam x="261" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4539" />
-<TGConnectingPoint num="1" id="4540" />
-<TGConnectingPoint num="2" id="4541" />
-<TGConnectingPoint num="3" id="4542" />
-<P1  x="271" y="165" id="4599" />
-<P2  x="216" y="109" id="4660" />
+<TGConnectingPoint num="0" id="5272" />
+<TGConnectingPoint num="1" id="5273" />
+<TGConnectingPoint num="2" id="5274" />
+<TGConnectingPoint num="3" id="5275" />
+<P1  x="271" y="165" id="5332" />
+<P2  x="216" y="109" id="5393" />
 <Point x="271" y="173" />
 <Point x="320" y="173" />
 <Point x="320" y="109" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4531" >
-<father id="4543" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5264" >
+<father id="5276" num="0" />
 <cdparam x="271" y="173" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4532" >
-<father id="4543" num="1" />
+<SUBCOMPONENT type="-1" id="5265" >
+<father id="5276" num="1" />
 <cdparam x="320" y="173" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4533" >
-<father id="4543" num="2" />
+<SUBCOMPONENT type="-1" id="5266" >
+<father id="5276" num="2" />
 <cdparam x="320" y="109" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4538" >
-<father id="4543" num="3" />
+<SUBCOMPONENT type="-1" id="5271" >
+<father id="5276" num="3" />
 <cdparam x="238" y="137" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4534" />
-<TGConnectingPoint num="1" id="4535" />
-<TGConnectingPoint num="2" id="4536" />
-<TGConnectingPoint num="3" id="4537" />
+<TGConnectingPoint num="0" id="5267" />
+<TGConnectingPoint num="1" id="5268" />
+<TGConnectingPoint num="2" id="5269" />
+<TGConnectingPoint num="3" id="5270" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4556" >
+<CONNECTOR type="5102" id="5289" >
 <cdparam x="79" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4552" />
-<TGConnectingPoint num="1" id="4553" />
-<TGConnectingPoint num="2" id="4554" />
-<TGConnectingPoint num="3" id="4555" />
-<P1  x="79" y="166" id="4621" />
-<P2  x="216" y="78" id="4644" />
+<TGConnectingPoint num="0" id="5285" />
+<TGConnectingPoint num="1" id="5286" />
+<TGConnectingPoint num="2" id="5287" />
+<TGConnectingPoint num="3" id="5288" />
+<P1  x="79" y="166" id="5354" />
+<P2  x="216" y="78" id="5377" />
 <Point x="79" y="189" />
 <Point x="341" y="189" />
 <Point x="341" y="78" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4544" >
-<father id="4556" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5277" >
+<father id="5289" num="0" />
 <cdparam x="79" y="189" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4545" >
-<father id="4556" num="1" />
+<SUBCOMPONENT type="-1" id="5278" >
+<father id="5289" num="1" />
 <cdparam x="341" y="189" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4546" >
-<father id="4556" num="2" />
+<SUBCOMPONENT type="-1" id="5279" >
+<father id="5289" num="2" />
 <cdparam x="341" y="78" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4551" >
-<father id="4556" num="3" />
+<SUBCOMPONENT type="-1" id="5284" >
+<father id="5289" num="3" />
 <cdparam x="79" y="206" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4547" />
-<TGConnectingPoint num="1" id="4548" />
-<TGConnectingPoint num="2" id="4549" />
-<TGConnectingPoint num="3" id="4550" />
+<TGConnectingPoint num="0" id="5280" />
+<TGConnectingPoint num="1" id="5281" />
+<TGConnectingPoint num="2" id="5282" />
+<TGConnectingPoint num="3" id="5283" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4569" >
+<CONNECTOR type="5102" id="5302" >
 <cdparam x="177" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4565" />
-<TGConnectingPoint num="1" id="4566" />
-<TGConnectingPoint num="2" id="4567" />
-<TGConnectingPoint num="3" id="4568" />
-<P1  x="177" y="166" id="4610" />
-<P2  x="216" y="91" id="4637" />
+<TGConnectingPoint num="0" id="5298" />
+<TGConnectingPoint num="1" id="5299" />
+<TGConnectingPoint num="2" id="5300" />
+<TGConnectingPoint num="3" id="5301" />
+<P1  x="177" y="166" id="5343" />
+<P2  x="216" y="91" id="5370" />
 <Point x="177" y="183" />
 <Point x="330" y="183" />
 <Point x="330" y="91" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4557" >
-<father id="4569" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5290" >
+<father id="5302" num="0" />
 <cdparam x="177" y="183" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4558" >
-<father id="4569" num="1" />
+<SUBCOMPONENT type="-1" id="5291" >
+<father id="5302" num="1" />
 <cdparam x="330" y="183" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4559" >
-<father id="4569" num="2" />
+<SUBCOMPONENT type="-1" id="5292" >
+<father id="5302" num="2" />
 <cdparam x="330" y="91" />
-<sizeparam width="1" height="1" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="4564" >
-<father id="4569" num="3" />
+<SUBCOMPONENT type="-1" id="5297" >
+<father id="5302" num="3" />
 <cdparam x="177" y="206" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4560" />
-<TGConnectingPoint num="1" id="4561" />
-<TGConnectingPoint num="2" id="4562" />
-<TGConnectingPoint num="3" id="4563" />
+<TGConnectingPoint num="0" id="5293" />
+<TGConnectingPoint num="1" id="5294" />
+<TGConnectingPoint num="2" id="5295" />
+<TGConnectingPoint num="3" id="5296" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4576" >
+<CONNECTOR type="5102" id="5309" >
 <cdparam x="165" y="44" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4575" />
-<P1  x="165" y="44" id="4631" />
-<P2  x="166" y="66" id="4634" />
+<TGConnectingPoint num="0" id="5308" />
+<P1  x="165" y="44" id="5364" />
+<P2  x="166" y="66" id="5367" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4574" >
-<father id="4576" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5307" >
+<father id="5309" num="0" />
 <cdparam x="165" y="84" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4570" />
-<TGConnectingPoint num="1" id="4571" />
-<TGConnectingPoint num="2" id="4572" />
-<TGConnectingPoint num="3" id="4573" />
+<TGConnectingPoint num="0" id="5303" />
+<TGConnectingPoint num="1" id="5304" />
+<TGConnectingPoint num="2" id="5305" />
+<TGConnectingPoint num="3" id="5306" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4583" >
+<CONNECTOR type="5102" id="5316" >
 <cdparam x="178" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4582" />
-<P1  x="128" y="116" id="4661" />
-<P2  x="79" y="136" id="4620" />
+<TGConnectingPoint num="0" id="5315" />
+<P1  x="128" y="116" id="5394" />
+<P2  x="79" y="136" id="5353" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4581" >
-<father id="4583" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5314" >
+<father id="5316" num="0" />
 <cdparam x="178" y="156" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4577" />
-<TGConnectingPoint num="1" id="4578" />
-<TGConnectingPoint num="2" id="4579" />
-<TGConnectingPoint num="3" id="4580" />
+<TGConnectingPoint num="0" id="5310" />
+<TGConnectingPoint num="1" id="5311" />
+<TGConnectingPoint num="2" id="5312" />
+<TGConnectingPoint num="3" id="5313" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4590" >
+<CONNECTOR type="5102" id="5323" >
 <cdparam x="178" y="168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4589" />
-<P1  x="166" y="116" id="4639" />
-<P2  x="177" y="136" id="4609" />
+<TGConnectingPoint num="0" id="5322" />
+<P1  x="166" y="116" id="5372" />
+<P2  x="177" y="136" id="5342" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4588" >
-<father id="4590" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5321" >
+<father id="5323" num="0" />
 <cdparam x="178" y="208" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4584" />
-<TGConnectingPoint num="1" id="4585" />
-<TGConnectingPoint num="2" id="4586" />
-<TGConnectingPoint num="3" id="4587" />
+<TGConnectingPoint num="0" id="5317" />
+<TGConnectingPoint num="1" id="5318" />
+<TGConnectingPoint num="2" id="5319" />
+<TGConnectingPoint num="3" id="5320" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4597" >
+<CONNECTOR type="5102" id="5330" >
 <cdparam x="216" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="4596" />
-<P1  x="216" y="116" id="4640" />
-<P2  x="271" y="135" id="4598" />
+<TGConnectingPoint num="0" id="5329" />
+<P1  x="216" y="116" id="5373" />
+<P2  x="271" y="135" id="5331" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4595" >
-<father id="4597" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5328" >
+<father id="5330" num="0" />
 <cdparam x="246" y="129" />
 <sizeparam width="10" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4591" />
-<TGConnectingPoint num="1" id="4592" />
-<TGConnectingPoint num="2" id="4593" />
-<TGConnectingPoint num="3" id="4594" />
+<TGConnectingPoint num="0" id="5324" />
+<TGConnectingPoint num="1" id="5325" />
+<TGConnectingPoint num="2" id="5326" />
+<TGConnectingPoint num="3" id="5327" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="4608" >
+<COMPONENT type="5104" id="5341" >
 <cdparam x="238" y="140" />
 <sizeparam width="67" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INerror()" />
-<TGConnectingPoint num="0" id="4598" />
-<TGConnectingPoint num="1" id="4599" />
-<TGConnectingPoint num="2" id="4600" />
-<TGConnectingPoint num="3" id="4601" />
-<TGConnectingPoint num="4" id="4602" />
-<TGConnectingPoint num="5" id="4603" />
-<TGConnectingPoint num="6" id="4604" />
-<TGConnectingPoint num="7" id="4605" />
-<TGConnectingPoint num="8" id="4606" />
-<TGConnectingPoint num="9" id="4607" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="4619" >
+<TGConnectingPoint num="0" id="5331" />
+<TGConnectingPoint num="1" id="5332" />
+<TGConnectingPoint num="2" id="5333" />
+<TGConnectingPoint num="3" id="5334" />
+<TGConnectingPoint num="4" id="5335" />
+<TGConnectingPoint num="5" id="5336" />
+<TGConnectingPoint num="6" id="5337" />
+<TGConnectingPoint num="7" id="5338" />
+<TGConnectingPoint num="8" id="5339" />
+<TGConnectingPoint num="9" id="5340" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="5352" >
 <cdparam x="136" y="141" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Receive signal" value="INconconf()" />
-<TGConnectingPoint num="0" id="4609" />
-<TGConnectingPoint num="1" id="4610" />
-<TGConnectingPoint num="2" id="4611" />
-<TGConnectingPoint num="3" id="4612" />
-<TGConnectingPoint num="4" id="4613" />
-<TGConnectingPoint num="5" id="4614" />
-<TGConnectingPoint num="6" id="4615" />
-<TGConnectingPoint num="7" id="4616" />
-<TGConnectingPoint num="8" id="4617" />
-<TGConnectingPoint num="9" id="4618" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="4630" >
+<TGConnectingPoint num="0" id="5342" />
+<TGConnectingPoint num="1" id="5343" />
+<TGConnectingPoint num="2" id="5344" />
+<TGConnectingPoint num="3" id="5345" />
+<TGConnectingPoint num="4" id="5346" />
+<TGConnectingPoint num="5" id="5347" />
+<TGConnectingPoint num="6" id="5348" />
+<TGConnectingPoint num="7" id="5349" />
+<TGConnectingPoint num="8" id="5350" />
+<TGConnectingPoint num="9" id="5351" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="5363" >
 <cdparam x="44" y="141" />
 <sizeparam width="70" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Send signal" value="INconreq()" />
-<TGConnectingPoint num="0" id="4620" />
-<TGConnectingPoint num="1" id="4621" />
-<TGConnectingPoint num="2" id="4622" />
-<TGConnectingPoint num="3" id="4623" />
-<TGConnectingPoint num="4" id="4624" />
-<TGConnectingPoint num="5" id="4625" />
-<TGConnectingPoint num="6" id="4626" />
-<TGConnectingPoint num="7" id="4627" />
-<TGConnectingPoint num="8" id="4628" />
-<TGConnectingPoint num="9" id="4629" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="4632" >
+<TGConnectingPoint num="0" id="5353" />
+<TGConnectingPoint num="1" id="5354" />
+<TGConnectingPoint num="2" id="5355" />
+<TGConnectingPoint num="3" id="5356" />
+<TGConnectingPoint num="4" id="5357" />
+<TGConnectingPoint num="5" id="5358" />
+<TGConnectingPoint num="6" id="5359" />
+<TGConnectingPoint num="7" id="5360" />
+<TGConnectingPoint num="8" id="5361" />
+<TGConnectingPoint num="9" id="5362" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="5365" >
 <cdparam x="158" y="24" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="4631" />
+<TGConnectingPoint num="0" id="5364" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="4673" >
+<COMPONENT type="5106" id="5438" >
 <cdparam x="116" y="66" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="state0" value="ACTIVE" />
-<TGConnectingPoint num="0" id="4633" />
-<TGConnectingPoint num="1" id="4634" />
-<TGConnectingPoint num="2" id="4635" />
-<TGConnectingPoint num="3" id="4636" />
-<TGConnectingPoint num="4" id="4637" />
-<TGConnectingPoint num="5" id="4638" />
-<TGConnectingPoint num="6" id="4639" />
-<TGConnectingPoint num="7" id="4640" />
-<TGConnectingPoint num="8" id="4641" />
-<TGConnectingPoint num="9" id="4642" />
-<TGConnectingPoint num="10" id="4643" />
-<TGConnectingPoint num="11" id="4644" />
-<TGConnectingPoint num="12" id="4645" />
-<TGConnectingPoint num="13" id="4646" />
-<TGConnectingPoint num="14" id="4647" />
-<TGConnectingPoint num="15" id="4648" />
-<TGConnectingPoint num="16" id="4649" />
-<TGConnectingPoint num="17" id="4650" />
-<TGConnectingPoint num="18" id="4651" />
-<TGConnectingPoint num="19" id="4652" />
-<TGConnectingPoint num="20" id="4653" />
-<TGConnectingPoint num="21" id="4654" />
-<TGConnectingPoint num="22" id="4655" />
-<TGConnectingPoint num="23" id="4656" />
-<TGConnectingPoint num="24" id="4657" />
-<TGConnectingPoint num="25" id="4658" />
-<TGConnectingPoint num="26" id="4659" />
-<TGConnectingPoint num="27" id="4660" />
-<TGConnectingPoint num="28" id="4661" />
-<TGConnectingPoint num="29" id="4662" />
-<TGConnectingPoint num="30" id="4663" />
-<TGConnectingPoint num="31" id="4664" />
-<TGConnectingPoint num="32" id="4665" />
-<TGConnectingPoint num="33" id="4666" />
-<TGConnectingPoint num="34" id="4667" />
-<TGConnectingPoint num="35" id="4668" />
-<TGConnectingPoint num="36" id="4669" />
-<TGConnectingPoint num="37" id="4670" />
-<TGConnectingPoint num="38" id="4671" />
-<TGConnectingPoint num="39" id="4672" />
+<TGConnectingPoint num="0" id="5366" />
+<TGConnectingPoint num="1" id="5367" />
+<TGConnectingPoint num="2" id="5368" />
+<TGConnectingPoint num="3" id="5369" />
+<TGConnectingPoint num="4" id="5370" />
+<TGConnectingPoint num="5" id="5371" />
+<TGConnectingPoint num="6" id="5372" />
+<TGConnectingPoint num="7" id="5373" />
+<TGConnectingPoint num="8" id="5374" />
+<TGConnectingPoint num="9" id="5375" />
+<TGConnectingPoint num="10" id="5376" />
+<TGConnectingPoint num="11" id="5377" />
+<TGConnectingPoint num="12" id="5378" />
+<TGConnectingPoint num="13" id="5379" />
+<TGConnectingPoint num="14" id="5380" />
+<TGConnectingPoint num="15" id="5381" />
+<TGConnectingPoint num="16" id="5382" />
+<TGConnectingPoint num="17" id="5383" />
+<TGConnectingPoint num="18" id="5384" />
+<TGConnectingPoint num="19" id="5385" />
+<TGConnectingPoint num="20" id="5386" />
+<TGConnectingPoint num="21" id="5387" />
+<TGConnectingPoint num="22" id="5388" />
+<TGConnectingPoint num="23" id="5389" />
+<TGConnectingPoint num="24" id="5390" />
+<TGConnectingPoint num="25" id="5391" />
+<TGConnectingPoint num="26" id="5392" />
+<TGConnectingPoint num="27" id="5393" />
+<TGConnectingPoint num="28" id="5394" />
+<TGConnectingPoint num="29" id="5395" />
+<TGConnectingPoint num="30" id="5396" />
+<TGConnectingPoint num="31" id="5397" />
+<TGConnectingPoint num="32" id="5398" />
+<TGConnectingPoint num="33" id="5399" />
+<TGConnectingPoint num="34" id="5400" />
+<TGConnectingPoint num="35" id="5401" />
+<TGConnectingPoint num="36" id="5402" />
+<TGConnectingPoint num="37" id="5403" />
+<TGConnectingPoint num="38" id="5404" />
+<TGConnectingPoint num="39" id="5405" />
+<TGConnectingPoint num="40" id="5406" />
+<TGConnectingPoint num="41" id="5407" />
+<TGConnectingPoint num="42" id="5408" />
+<TGConnectingPoint num="43" id="5409" />
+<TGConnectingPoint num="44" id="5410" />
+<TGConnectingPoint num="45" id="5411" />
+<TGConnectingPoint num="46" id="5412" />
+<TGConnectingPoint num="47" id="5413" />
+<TGConnectingPoint num="48" id="5414" />
+<TGConnectingPoint num="49" id="5415" />
+<TGConnectingPoint num="50" id="5416" />
+<TGConnectingPoint num="51" id="5417" />
+<TGConnectingPoint num="52" id="5418" />
+<TGConnectingPoint num="53" id="5419" />
+<TGConnectingPoint num="54" id="5420" />
+<TGConnectingPoint num="55" id="5421" />
+<TGConnectingPoint num="56" id="5422" />
+<TGConnectingPoint num="57" id="5423" />
+<TGConnectingPoint num="58" id="5424" />
+<TGConnectingPoint num="59" id="5425" />
+<TGConnectingPoint num="60" id="5426" />
+<TGConnectingPoint num="61" id="5427" />
+<TGConnectingPoint num="62" id="5428" />
+<TGConnectingPoint num="63" id="5429" />
+<TGConnectingPoint num="64" id="5430" />
+<TGConnectingPoint num="65" id="5431" />
+<TGConnectingPoint num="66" id="5432" />
+<TGConnectingPoint num="67" id="5433" />
+<TGConnectingPoint num="68" id="5434" />
+<TGConnectingPoint num="69" id="5435" />
+<TGConnectingPoint num="70" id="5436" />
+<TGConnectingPoint num="71" id="5437" />
 <extraparam>
 </extraparam>
 </COMPONENT>
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index 1abe6db0125707aa8e64cf54edd7f100fe946bda..a9bb6a099ac2b885bbcc15bb0da3c656d352443d 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="2" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="1" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="TML Component Design" nameTab="AppC" tabs="TML Component Task Diagram$Application$TCPIP$Timer$InterfaceDevice$SmartCard" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="0" maxX="2724" minY="0" maxY="916" channels="true" events="true" requests="true" zoom="1.0000000000000018" >
@@ -1330,8 +1330,8 @@
 </SUBCOMPONENT>
 
 <COMPONENT type="1010" id="245" >
-<cdparam x="476" y="129" />
-<sizeparam width="72" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="469" y="129" />
+<sizeparam width="86" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1344,8 +1344,8 @@
 </COMPONENT>
 
 <COMPONENT type="1008" id="248" >
-<cdparam x="442" y="192" />
-<sizeparam width="139" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="439" y="192" />
+<sizeparam width="145" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1371,7 +1371,7 @@
 <SUBCOMPONENT type="-1" id="249" >
 <father id="256" num="0" />
 <cdparam x="470" y="524" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
@@ -1379,7 +1379,7 @@
 <SUBCOMPONENT type="-1" id="250" >
 <father id="256" num="1" />
 <cdparam x="530" y="524" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
@@ -1387,7 +1387,7 @@
 <SUBCOMPONENT type="-1" id="251" >
 <father id="256" num="2" />
 <cdparam x="515" y="559" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
 <infoparam name="guard 3" value="[ ]" />
@@ -1403,8 +1403,8 @@
 </COMPONENT>
 
 <COMPONENT type="1008" id="261" >
-<cdparam x="479" y="71" />
-<sizeparam width="52" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="472" y="71" />
+<sizeparam width="67" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1417,8 +1417,8 @@
 </COMPONENT>
 
 <COMPONENT type="1006" id="264" >
-<cdparam x="467" y="353" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="459" y="353" />
+<sizeparam width="100" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1431,8 +1431,8 @@
 </COMPONENT>
 
 <COMPONENT type="1008" id="267" >
-<cdparam x="468" y="399" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="461" y="399" />
+<sizeparam width="95" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1455,8 +1455,8 @@
 </COMPONENT>
 
 <COMPONENT type="1008" id="272" >
-<cdparam x="560" y="589" />
-<sizeparam width="54" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="553" y="589" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -1469,8 +1469,8 @@
 </COMPONENT>
 
 <COMPONENT type="1008" id="275" >
-<cdparam x="407" y="597" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="400" y="597" />
+<sizeparam width="67" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -2713,7 +2713,6 @@
 <infoparam name="wait event" value="open() " />
 <TGConnectingPoint num="0" id="534" />
 <TGConnectingPoint num="1" id="535" />
-<breakpoint />
 <extraparam>
 <Data eventName="open" nbOfParams="5" />
 </extraparam>
@@ -2735,7 +2734,6 @@
 <TGConnectingPoint num="7" id="544" />
 <TGConnectingPoint num="8" id="545" />
 <TGConnectingPoint num="9" id="546" />
-<breakpoint />
 </COMPONENT>
 
 <COMPONENT type="1001" id="549" >
@@ -5430,7 +5428,6 @@ On prend b=1 comme exemple
 <infoparam name="send event" value="timeOut()" />
 <TGConnectingPoint num="0" id="1191" />
 <TGConnectingPoint num="1" id="1192" />
-<breakpoint />
 <extraparam>
 <Data eventName="timeOut" nbOfParams="5" />
 </extraparam>
@@ -5445,7 +5442,6 @@ On prend b=1 comme exemple
 <infoparam name="wait event" value="stop() " />
 <TGConnectingPoint num="0" id="1194" />
 <TGConnectingPoint num="1" id="1195" />
-<breakpoint />
 <extraparam>
 <Data eventName="stop" nbOfParams="5" />
 </extraparam>
@@ -5527,8 +5523,8 @@ On prend b=1 comme exemple
 
 <TMLActivityDiagramPanel name="InterfaceDevice" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1008" id="1210" >
-<cdparam x="318" y="433" />
-<sizeparam width="44" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="310" y="433" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5555,7 +5551,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1211" >
 <father id="1218" num="0" />
 <cdparam x="521" y="386" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
@@ -5563,7 +5559,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1212" >
 <father id="1218" num="1" />
 <cdparam x="581" y="386" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
@@ -5571,7 +5567,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1213" >
 <father id="1218" num="2" />
 <cdparam x="566" y="421" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
 <infoparam name="guard 3" value="[ ]" />
@@ -5591,7 +5587,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1219" >
 <father id="1226" num="0" />
 <cdparam x="599" y="527" />
-<sizeparam width="52" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="51" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
@@ -5600,7 +5596,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1220" >
 <father id="1226" num="1" />
 <cdparam x="679" y="527" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="12" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
@@ -5608,7 +5604,7 @@ On prend b=1 comme exemple
 <SUBCOMPONENT type="-1" id="1221" >
 <father id="1226" num="2" />
 <cdparam x="664" y="562" />
-<sizeparam width="42" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="41" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
@@ -5625,8 +5621,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1007" id="1231" >
-<cdparam x="188" y="137" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="183" y="137" />
+<sizeparam width="92" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5639,8 +5635,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1008" id="1234" >
-<cdparam x="202" y="237" />
-<sizeparam width="53" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="195" y="237" />
+<sizeparam width="67" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5654,8 +5650,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1010" id="1237" >
-<cdparam x="168" y="288" />
-<sizeparam width="120" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="163" y="288" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5668,8 +5664,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1008" id="1240" >
-<cdparam x="207" y="337" />
-<sizeparam width="43" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="199" y="337" />
+<sizeparam width="60" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5682,15 +5678,14 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1010" id="1243" >
-<cdparam x="387" y="152" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="380" y="152" />
+<sizeparam width="109" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="wait event" value="pTSConfirm() " />
 <TGConnectingPoint num="0" id="1241" />
 <TGConnectingPoint num="1" id="1242" />
-<breakpoint />
 <extraparam>
 <Data eventName="pTSConfirm" nbOfParams="5" />
 </extraparam>
@@ -5698,7 +5693,7 @@ On prend b=1 comme exemple
 
 <COMPONENT type="301" id="1260" >
 <cdparam x="453" y="214" />
-<sizeparam width="114" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="105" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="data exchange
@@ -5725,8 +5720,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1006" id="1263" >
-<cdparam x="429" y="448" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="423" y="448" />
+<sizeparam width="107" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5739,8 +5734,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1008" id="1266" >
-<cdparam x="419" y="507" />
-<sizeparam width="115" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="412" y="507" />
+<sizeparam width="129" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5765,8 +5760,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1017" id="1271" >
-<cdparam x="588" y="447" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="585" y="447" />
+<sizeparam width="148" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5788,8 +5783,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1009" id="1276" >
-<cdparam x="610" y="700" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="604" y="700" />
+<sizeparam width="111" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5802,8 +5797,8 @@ On prend b=1 comme exemple
 </COMPONENT>
 
 <COMPONENT type="1010" id="1279" >
-<cdparam x="600" y="619" />
-<sizeparam width="119" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="595" y="619" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -5885,7 +5880,7 @@ On prend b=1 comme exemple
 <cdparam x="78" y="363" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to wait event" value="null" />
-<P1  x="228" y="362" id="1239" />
+<P1  x="229" y="362" id="1239" />
 <P2  x="434" y="147" id="1241" />
 <Point x="228" y="382" />
 <Point x="228" y="382" />
@@ -5930,14 +5925,14 @@ On prend b=1 comme exemple
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to send request" value="null" />
 <P1  x="229" y="78" id="1227" />
-<P2  x="228" y="132" id="1229" />
+<P2  x="229" y="132" id="1229" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1298" >
 <cdparam x="228" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to send event" value="null" />
-<P1  x="228" y="162" id="1230" />
+<P1  x="229" y="162" id="1230" />
 <P2  x="228" y="232" id="1232" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -5946,7 +5941,7 @@ On prend b=1 comme exemple
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to send event" value="null" />
 <P1  x="228" y="313" id="1236" />
-<P2  x="228" y="332" id="1238" />
+<P2  x="229" y="332" id="1238" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1300" >
@@ -6002,14 +5997,14 @@ On prend b=1 comme exemple
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
 <P1  x="659" y="572" id="1225" />
-<P2  x="659" y="614" id="1277" />
+<P2  x="660" y="614" id="1277" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1307" >
 <cdparam x="670" y="644" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="659" y="644" id="1278" />
+<P1  x="660" y="644" id="1278" />
 <P2  x="659" y="695" id="1274" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -6104,7 +6099,6 @@ On prend b=1 comme exemple
 <infoparam name="send event" value="answerToReset()" />
 <TGConnectingPoint num="0" id="1323" />
 <TGConnectingPoint num="1" id="1324" />
-<breakpoint />
 <extraparam>
 <Data eventName="answerToReset" nbOfParams="5" />
 </extraparam>
@@ -6194,7 +6188,6 @@ the smart card and the terminal
 <infoparam name="send request" value="start_Application()" />
 <TGConnectingPoint num="0" id="1352" />
 <TGConnectingPoint num="1" id="1353" />
-<breakpoint />
 <extraparam>
 <Data requestName="start_Application" nbOfParams="5" />
 </extraparam>
@@ -6325,7 +6318,6 @@ the smart card and the terminal
 <infoparam name="wait event" value="data_Ready(t, b) " />
 <TGConnectingPoint num="0" id="1380" />
 <TGConnectingPoint num="1" id="1381" />
-<breakpoint />
 <extraparam>
 <Data eventName="data_Ready" nbOfParams="5" />
 <Param index="0" value="t" />
@@ -6707,9 +6699,9 @@ the smart card and the terminal
 <SUBCOMPONENT type="1101" id="1484" >
 <father id="1545" num="0" />
 <cdparam x="152" y="154" />
-<sizeparam width="172" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="287" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::InterfaceDevice" />
 <TGConnectingPoint num="0" id="1476" />
 <TGConnectingPoint num="1" id="1477" />
@@ -6726,9 +6718,9 @@ the smart card and the terminal
 <SUBCOMPONENT type="1101" id="1493" >
 <father id="1545" num="1" />
 <cdparam x="351" y="153" />
-<sizeparam width="141" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::SmartCard" />
 <TGConnectingPoint num="0" id="1485" />
 <TGConnectingPoint num="1" id="1486" />
@@ -6745,9 +6737,9 @@ the smart card and the terminal
 <SUBCOMPONENT type="1101" id="1502" >
 <father id="1545" num="2" />
 <cdparam x="156" y="246" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="108" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="351" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::TCPIP" />
 <TGConnectingPoint num="0" id="1494" />
 <TGConnectingPoint num="1" id="1495" />
@@ -6764,9 +6756,9 @@ the smart card and the terminal
 <SUBCOMPONENT type="1101" id="1511" >
 <father id="1545" num="3" />
 <cdparam x="350" y="234" />
-<sizeparam width="144" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
+<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
 <infoparam name="TGComponent" value="AppC::Application" />
 <TGConnectingPoint num="0" id="1503" />
 <TGConnectingPoint num="1" id="1504" />
diff --git a/simulators/c++2/src_simulator/sim/Server.cpp b/simulators/c++2/src_simulator/sim/Server.cpp
index 98c5f7d9fd885a9a58b4fd4233a71f7ee4543a38..6d73b6752dfc7c57531583570f51aacc4610d6ea 100644
--- a/simulators/c++2/src_simulator/sim/Server.cpp
+++ b/simulators/c++2/src_simulator/sim/Server.cpp
@@ -89,7 +89,7 @@ int Server::run(){
 
 	if (p == NULL){
 		std::cerr << "server: failed to bind\n";
-		return 1;
+		exit(0);
 	}
 	
 	freeaddrinfo(aServerInfo);
diff --git a/src/main/java/avatartranslator/AvatarRandom.java b/src/main/java/avatartranslator/AvatarRandom.java
index 71c60bd60257fa83e9eb2cf9e8a55b4da27da138..3082e3c4dcb957c8c8332203f9ddd757ac0e1b38 100644
--- a/src/main/java/avatartranslator/AvatarRandom.java
+++ b/src/main/java/avatartranslator/AvatarRandom.java
@@ -57,12 +57,14 @@ public class AvatarRandom extends AvatarStateMachineElement {
     public final static int RANDOM_TRIANGULAR_LAW = 1;
     public final static int RANDOM_GAUSSIAN_LAW = 2;
     public final static int RANDOM_LOG_NORMAL_LAW = 3;
-    public final static String[] DISTRIBUTION_LAWS = {"Uniform", "Triangular", "Gaussian", "Log normal"};
-    public final static String[] DISTRIBUTION_LAWS_SHORT = {"", " ^", "ĝ", "ln"};
-
-    public final static int[] NB_OF_EXTRA_ATTRIBUTES = {0, 1, 1, 2};
-    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_1 = {"", "triangle top", "standard deviation", "standard deviation"};
-    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_2 = {"", "", "", "mean"};
+    public final static int RANDOM_EXPONENTIAL_LAW = 4;
+    public final static int RANDOM_WEIBULL_LAW = 5;
+    public final static String[] DISTRIBUTION_LAWS = {"Uniform", "Triangular", "Gaussian", "Log normal", "Exponential", "Weibull"};
+    public final static String[] DISTRIBUTION_LAWS_SHORT = {"", " ^", "ĝ", "ln", "e^", "w"};
+
+    public final static int[] NB_OF_EXTRA_ATTRIBUTES = {0, 1, 1, 2, 1, 2};
+    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_1 = {"", "triangle top", "standard deviation", "standard deviation", "mean", "shape"};
+    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_2 = {"", "", "", "mean", "", "scale"};
     protected int functionId;
     protected String extraAttribute1;
     protected String extraAttribute2;
diff --git a/src/main/java/avatartranslator/AvatarTransition.java b/src/main/java/avatartranslator/AvatarTransition.java
index 0bbde5bf74a3fd22836d7f80ee92bab87dab0250..18fc1432d4e874f956e46269592d144983d5ea33 100644
--- a/src/main/java/avatartranslator/AvatarTransition.java
+++ b/src/main/java/avatartranslator/AvatarTransition.java
@@ -57,11 +57,16 @@ public class AvatarTransition extends AvatarStateMachineElement {
     public final static int DELAY_UNIFORM_LAW = 0;
     public final static int DELAY_TRIANGULAR_LAW = 1;
     public final static int DELAY_GAUSSIAN_LAW = 2;
-    public final static String[] DISTRIBUTION_LAWS = {"Uniform", "Triangular", "Gaussian"};
-    public final static String[] DISTRIBUTION_LAWS_SHORT = {"", " ^", "ĝ"};
+    public final static int RANDOM_LOG_NORMAL_LAW = 3;
+    public final static int RANDOM_EXPONENTIAL_LAW = 4;
+    public final static int RANDOM_WEIBULL_LAW = 5;
+    public final static String[] DISTRIBUTION_LAWS = {"Uniform", "Triangular", "Gaussian", "Log normal", "Exponential", "Weibull"};
+    public final static String[] DISTRIBUTION_LAWS_SHORT = {"", " ^", "ĝ", "ln", "e^", "w"};
+
+    public final static int[] NB_OF_EXTRA_ATTRIBUTES = {0, 1, 1, 2, 1, 2};
+    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_1 = {"", "triangle top", "standard deviation", "standard deviation", "mean", "shape"};
+    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES_2 = {"", "", "", "mean", "", "scale"};
 
-    public final static int[] NB_OF_EXTRA_ATTRIBUTES = {0, 1, 1};
-    public final static String[] LABELS_OF_EXTRA_ATTRIBUTES = {"", "triangle top", "standard deviation"};
 
     // Type management: to be used by code generators
     public static final int UNDEFINED = -1;
@@ -82,6 +87,7 @@ public class AvatarTransition extends AvatarStateMachineElement {
     private AvatarGuard guard;
     private String minDelay = "", maxDelay = "";
     private String delayExtra1 = ""; // Used for some of the distribution law
+    private String delayExtra2 = ""; // Used for some of the distribution law
     private int delayDistributionLaw = 0;
 
     private String minCompute = "", maxCompute = "";
@@ -254,9 +260,10 @@ public class AvatarTransition extends AvatarStateMachineElement {
         maxDelay = _maxDelay;
     }
 
-    public void setDistributionLaw(int _law, String _delayExtra1 ) {
+    public void setDistributionLaw(int _law, String _delayExtra1, String _delayExtra2 ) {
         delayDistributionLaw = _law;
         delayExtra1 = _delayExtra1;
+        delayExtra2 = _delayExtra2;
     }
 
     public void setComputes(String _minCompute, String _maxCompute) {
@@ -285,6 +292,10 @@ public class AvatarTransition extends AvatarStateMachineElement {
         return delayExtra1;
     }
 
+    public String getDelayExtra2() {
+        return delayExtra2;
+    }
+
     public String getMinCompute() {
         return minCompute;
     }
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
index 21f5616d1d3aee34a1856373507d01d58a01e04b..1b2c58e0ea834d933587cfa8ebc9e6e069c073e0 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -227,6 +227,7 @@ public class AvatarSimulationBlock {
                         aspt.myMaxDelay = evaluateIntExpression(trans.getMaxDelay(), lastTransaction.attributeValues);
                         aspt.hasDelay = true;
                         aspt.extraParam1 = evaluateIntExpression(trans.getDelayExtra1(), lastTransaction.attributeValues);
+                        aspt.extraParam2 = evaluateIntExpression(trans.getDelayExtra2(), lastTransaction.attributeValues);
                         aspt.delayDistributionLaw = trans.getDelayDistributionLaw();
                         if (lastTransaction != null) {
                             if (lastTransaction.clockValueWhenFinished < _clockValue) {
@@ -242,7 +243,8 @@ public class AvatarSimulationBlock {
                         aspt.myMinDelay = evaluateIntExpression(trans.getMinDelay(), lastTransaction.attributeValues);
                         aspt.myMaxDelay = evaluateIntExpression(trans.getMaxDelay(), lastTransaction.attributeValues);
                         aspt.hasDelay = true;
-                        aspt.extraParam1 = evaluateIntExpression(trans.getDelayExtra1(), lastTransaction.attributeValues);
+                        aspt.extraParam1 = evaluateDoubleExpression(trans.getDelayExtra1(), lastTransaction.attributeValues);
+                        aspt.extraParam2 = evaluateDoubleExpression(trans.getDelayExtra2(), lastTransaction.attributeValues);
                         aspt.delayDistributionLaw = trans.getDelayDistributionLaw();
 
                         //TraceManager.addDev(">>>>>   Signal with delay before");
@@ -694,6 +696,15 @@ public class AvatarSimulationBlock {
         return block.getAttribute(_index).getName();
     }
 
+    public double evaluateDoubleExpression(String _expr,  Vector<String> _attributeValues) {
+        try {
+            double ret = Double.parseDouble(_expr);
+            return ret;
+        } catch (Exception e) {
+            return 0.0;
+        }
+    }
+
     public int evaluateIntExpression(String _expr, Vector<String> _attributeValues) {
         String act = _expr;
         int cpt = 0;
@@ -755,6 +766,20 @@ public class AvatarSimulationBlock {
                     TraceManager.addDev("Exception on log normal: " + e.getMessage());
                     return minV;
                 }
+            case AvatarRandom.RANDOM_EXPONENTIAL_LAW:
+                try {
+                    return (int) (Math.floor(MyMath.exponentialDistribution( (double) (minV), (double) (maxV), extra1) ));
+                } catch (Exception e) {
+                    TraceManager.addDev("Exception on exponential distribution: " + e.getMessage());
+                    return minV;
+                }
+            case AvatarRandom.RANDOM_WEIBULL_LAW:
+                try {
+                    return (int) (Math.floor(MyMath.weibullDistribution( (double) (minV), (double) (maxV), extra1, extra2) ));
+                } catch (Exception e) {
+                    TraceManager.addDev("Exception on weibull distribution: " + e.getMessage());
+                    return minV;
+                }
         }
         return minV;
     }
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
index b325baa03d8f0cb8efcb6f48fbcea788a6b767bc..54225e37baa793ce589874fb55e51493c66b40a4 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationPendingTransaction.java
@@ -39,6 +39,7 @@
 
 package avatartranslator.directsimulation;
 
+import avatartranslator.AvatarRandom;
 import avatartranslator.AvatarStateMachineElement;
 import avatartranslator.AvatarTransition;
 import myutil.MyMath;
@@ -76,6 +77,7 @@ public class AvatarSimulationPendingTransaction {
     public boolean hasDelay;
     public int delayDistributionLaw;
     public double extraParam1;
+    public double extraParam2;
 
     // For time already elapsed for that transition
     public boolean hasElapsedTime;
@@ -272,6 +274,34 @@ public class AvatarSimulationPendingTransaction {
                 //TraceManager.addDev("\n\n\n******* GAUSSIAN LAW ********");
                 selectedDuration = (int)(Math.floor(MyMath.gaussianDistribution((double) (myMinDuration), (double) (maxDuration), extraParam1)));
                 return;
+            case AvatarTransition.RANDOM_LOG_NORMAL_LAW:
+                try {
+                    selectedDuration =  (int) (Math.floor(MyMath.logNormalDistribution((double) (myMinDuration), (double) (maxDuration),
+                            extraParam1,
+                            extraParam2)));
+                } catch (Exception e) {
+                    TraceManager.addDev("Exception on log normal: " + e.getMessage());
+                    selectedDuration = myMinDuration;
+                }
+                return;
+            case AvatarTransition.RANDOM_EXPONENTIAL_LAW:
+                try {
+                    selectedDuration =  (int) (Math.floor(MyMath.exponentialDistribution( (double) (myMinDuration), (double) (maxDuration), extraParam1) ));
+                } catch (Exception e) {
+                    TraceManager.addDev("Exception on exponential distribution: " + e.getMessage());
+                    selectedDuration = myMinDuration;
+                }
+                return;
+            case AvatarTransition.RANDOM_WEIBULL_LAW:
+                try {
+                    selectedDuration = (int) (Math.floor(MyMath.weibullDistribution( (double) (myMinDuration), (double) (maxDuration), extraParam1,
+                            extraParam2) ));
+                } catch (Exception e) {
+                    TraceManager.addDev("Exception on weibull distribution: " + e.getMessage());
+                    selectedDuration = myMinDuration;
+                }
+                return;
+
         }
     }
 
diff --git a/src/main/java/cli/Action.java b/src/main/java/cli/Action.java
index 7c0b3819f8f9a0597eeb159e87f2256cc7c9498f..8f038b5364cadf60cb58dfe244cc8c1b1d97f492 100644
--- a/src/main/java/cli/Action.java
+++ b/src/main/java/cli/Action.java
@@ -73,10 +73,19 @@ import java.util.List;
  */
 public class Action extends Command {
     // Action commands
+    private final static String NEW = "new";
     private final static String OPEN = "open";
+    private final static String SAVE = "save";
+    private final static String SET_FILE = "set-file";
+    private final static String GET_FILE = "get-file";
     private final static String RESIZE = "resize";
     private final static String START = "start";
     private final static String QUIT = "quit";
+
+    private final static String NEW_DESIGN = "new-design";
+    private final static String REMOVE_CURRENT_TAB = "remove-current-tab";
+
+
     private final static String CHECKSYNTAX = "check-syntax";
     private final static String DIPLO_INTERACTIVE_SIMULATION = "diplodocus-interactive-simulation";
     private final static String DIPLO_FORMAL_VERIFICATION = "diplodocus-formal-verification";
@@ -190,7 +199,7 @@ public class Action extends Command {
             }
         };
 
-        // Open
+        // Resize
         Command resize = new Command() {
             public String getCommand() {
                 return RESIZE;
@@ -250,6 +259,122 @@ public class Action extends Command {
             }
         };
 
+        // New
+        Command newT = new Command() {
+            public String getCommand() {
+                return NEW;
+            }
+
+            public String getShortCommand() {
+                return "n";
+            }
+
+            public String getDescription() {
+                return "Creating a new model in TTool";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                interpreter.mgui.newProject();
+
+                return null;
+            }
+        };
+
+        // Set-File
+        Command setFile = new Command() {
+            public String getCommand() {
+                return SET_FILE;
+            }
+
+            public String getShortCommand() {
+                return "sf";
+            }
+
+            public String getDescription() {
+                return "Setting the save file of TTool";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                String[] commands = command.split(" ");
+                if (commands.length < 1) {
+                    return Interpreter.BAD;
+                }
+
+                String fileName = commands[commands.length-1];
+
+                interpreter.mgui.setFileName(fileName);
+
+                return null;
+            }
+        };
+
+        Command getFile = new Command() {
+            public String getCommand() {
+                return GET_FILE;
+            }
+
+            public String getShortCommand() {
+                return "gf";
+            }
+
+            public String getDescription() {
+                return "Get the name of the  model under edition TTool. If a variable is provided as argument, the " +
+                        "result is saved into this variable";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                String[] commands = command.split(" ");
+
+
+                String fileName = interpreter.mgui.getFileName();
+
+                if (commands.length > 0) {
+                    interpreter.addVariable(commands[0], fileName);
+                }
+
+                System.out.println(fileName);
+
+                return null;
+            }
+        };
+
+        // Save
+        Command save = new Command() {
+            public String getCommand() {
+                return SAVE;
+            }
+
+            public String getShortCommand() {
+                return "sm";
+            }
+
+            public String getDescription() {
+                return "Saving a model in TTool";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                interpreter.mgui.saveProject();
+
+                return null;
+            }
+        };
+
         // Quit
         Command quit = new Command() {
             public String getCommand() {
@@ -273,6 +398,56 @@ public class Action extends Command {
             }
         };
 
+        // New (avatar) design
+        Command newDesign = new Command() {
+            public String getCommand() {
+                return NEW_DESIGN;
+            }
+
+            public String getShortCommand() {
+                return "nd";
+            }
+
+            public String getDescription() {
+                return "Create a new design view";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                interpreter.mgui.newDesign();
+
+                return null;
+            }
+        };
+
+        // Remove current tab
+        Command removeCurrentTab = new Command() {
+            public String getCommand() {
+                return REMOVE_CURRENT_TAB;
+            }
+
+            public String getShortCommand() {
+                return "rct";
+            }
+
+            public String getDescription() {
+                return "Remove the current tab";
+            }
+
+            public String executeCommand(String command, Interpreter interpreter) {
+                if (!interpreter.isTToolStarted()) {
+                    return Interpreter.TTOOL_NOT_STARTED;
+                }
+
+                interpreter.mgui.removeCurrentTab();
+
+                return null;
+            }
+        };
+
         // Check syntax
         Command checkSyntax = new Command() {
             public String getCommand() {
@@ -900,9 +1075,17 @@ public class Action extends Command {
 
 
         addAndSortSubcommand(start);
+        addAndSortSubcommand(newT);
         addAndSortSubcommand(open);
+        addAndSortSubcommand(setFile);
+        addAndSortSubcommand(getFile);
+        addAndSortSubcommand(save);
         addAndSortSubcommand(resize);
         addAndSortSubcommand(quit);
+
+        addAndSortSubcommand(newDesign);
+        addAndSortSubcommand(removeCurrentTab);
+
         addAndSortSubcommand(checkSyntax);
         addAndSortSubcommand(generateRGFromAvatar);
         addAndSortSubcommand(diplodocusInteractiveSimulation);
diff --git a/src/main/java/cli/Interpreter.java b/src/main/java/cli/Interpreter.java
index dd8472c4df4b6acd19be11e6c5a2efbb29b1ee29..b5f027076ff2fa143c38f87e7923a3d46c17b41a 100644
--- a/src/main/java/cli/Interpreter.java
+++ b/src/main/java/cli/Interpreter.java
@@ -236,6 +236,14 @@ public class Interpreter implements Runnable, TerminalProviderInterface {
         variables.put(name, value);
     }
 
+    public String getVariableValue(String name) {
+        String v = variables.get(name);
+        if (v == null) {
+            return "";
+        }
+        return v;
+    }
+
     private String removeVariablesIn(String input) {
         String ret = "";
         String initialLine = input;
diff --git a/src/main/java/cli/Print.java b/src/main/java/cli/Print.java
index 747cc5f5371f76101393f9a4b69d4a48bd0c9dae..09c74ebb927d941e1ef101c0fd3c2b098bac26c2 100644
--- a/src/main/java/cli/Print.java
+++ b/src/main/java/cli/Print.java
@@ -61,6 +61,7 @@ import java.util.*;
 public class Print extends Command  {
     private final static String TABS = "tabs";
     private final static String DIR = "dir";
+    private final static String VAR = "var";
 
     public Print() {
 
@@ -136,13 +137,30 @@ public class Print extends Command  {
             public  String executeCommand(String command, Interpreter interpreter) {
 
 
-                System.out.println("Defautl directory: " +  System.getProperty("user.dir"));
+                System.out.println("Default directory: " +  System.getProperty("user.dir"));
+
+                return null;
+            }
+        };
+        Command var = new Command() {
+            public String getCommand() { return VAR; }
+            public String getShortCommand() { return "v"; }
+            public String getDescription() { return "Printing the value of the variable provided as input"; }
+
+            public  String executeCommand(String command, Interpreter interpreter) {
+                String[] commands = command.split(" ");
+                if (commands.length < 1) {
+                    return Interpreter.BAD;
+                }
+
+                System.out.println("Variable " +  commands[0] + " = " + interpreter.getVariableValue(commands[0]));
 
                 return null;
             }
         };
         addAndSortSubcommand(tabs);
         addAndSortSubcommand(dir);
+        addAndSortSubcommand(var);
 
     }
 
diff --git a/src/main/java/cli/SimulatorScript.java b/src/main/java/cli/SimulatorScript.java
index 522f0b7f30c4561bed0f6b2338ac69b3f9125d09..16c44a86031c24e89b28b6cbc526cc4174242004 100644
--- a/src/main/java/cli/SimulatorScript.java
+++ b/src/main/java/cli/SimulatorScript.java
@@ -66,6 +66,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.*;
+import java.rmi.Remote;
 import java.util.BitSet;
 import java.util.*;
 
@@ -85,7 +86,9 @@ public class SimulatorScript extends Command  implements Runnable  {
 
     private long [] times;
     private int currentIndex;
+    private long latestTime = -1;
     private RemoteConnection rc;
+    private boolean isReady = false;
 
     public SimulatorScript() {
 
@@ -150,7 +153,7 @@ public class SimulatorScript extends Command  implements Runnable  {
 
 
         // Starts simulation
-        Process simuProcess = Runtime.getRuntime().exec(simuPath + " -server");
+        //Process simuProcess = Runtime.getRuntime().exec(simuPath + " -server");
 
         // Wait for one second
         Thread.sleep(1000);
@@ -160,19 +163,28 @@ public class SimulatorScript extends Command  implements Runnable  {
         rc = new RemoteConnection("localhost");
         try {
             rc.connect();
+            isReady = true;
         } catch (RemoteConnectionException rce) {
             return "Could not connect";
         }
 
+        Thread t = new Thread(this);
+        t.start();
 
-        // Opens the two files
+
+        // Opens the input file
         boolean running = true;
         BufferedInputStream reader = new BufferedInputStream(new FileInputStream( inputFile ) );
+
+
+
         String readString = "";
         String line = "";
         boolean first = true;
         double lastValue = 0;
 
+
+
         try {
             while (running) {
                 if (reader.available() > 0) {
@@ -185,20 +197,32 @@ public class SimulatorScript extends Command  implements Runnable  {
                         // End of line
                         // Must handle the line
                         line = readString.trim();
-                        TraceManager.addDev("Line read:" + line);
+                        //TraceManager.addDev("Line read:" + line);
                         readString = "";
-                        String lines[] = line.split(" ");
+                        //line = Conversion.replaceAllString(line, "\t", " ");
+                        //line = Conversion.replaceAllString(line, "  ", " ");
+                        //TraceManager.addDev("Line read:" + line);
+                        String lines[] = line.split("\\s+");
+                        /*for(String s: lines) {
+                            TraceManager.addDev("\t>" + s + "<");
+                        }*/
                         if (lines.length > 1) {
+                            //TraceManager.addDev("Lines length: " + lines.length);
                             double value1 = Double.parseDouble(lines[1]);
                             if (first) {
+                                //TraceManager.addDev("First value");
                                 first = false;
                                 lastValue = value1;
                             } else {
                                 if (value1 != lastValue) {
+
                                     lastValue = value1;
                                     double time1 = Double.parseDouble(lines[0]);
+                                    TraceManager.addDev("Sender. Time: " + time1 + " New value: " + value1);
                                     // Run simulation until time1
-                                    runSimulationTo(rc, time1);
+                                    //runSimulationTo(rc, time1);
+                                    //Thread.sleep(50);
+                                    //waitForNextTime(rc);
                                     // Remove all transactions
                                     removeAllTransactions(rc);
                                     currentIndex = 0;
@@ -206,15 +230,34 @@ public class SimulatorScript extends Command  implements Runnable  {
                                     // Get time of event1
                                     for(int i=0; i<channels.length; i++) {
                                         // Wait for channel operation
-                                        runUntilChannel(rc, channels[0]);
+                                        TraceManager.addDev("Sender. i. " + i + " - Running until channel: " + channels[i]);
+                                        runUntilChannel(rc, channels[i]);
+                                        Thread.sleep(5);
+                                        TraceManager.addDev("Sender. Waiting for current time");
+
                                         // Get current Time
-                                        sendGetSimulationTime(rc);
-                                        waitForNextIndex();
+                                        //sendGetSimulationTime(rc);
+                                        //Thread.sleep(50);
+                                        times[currentIndex++] = waitForNextTime(rc);
+                                        TraceManager.addDev("Sender. Simulation time is: " + times[i]);
                                     }
+                                    // Compute final time
+                                    long finalTime = times[times.length-1] - times[0];
+                                    TraceManager.addDev("Sender. Final time: " + finalTime + " clock cycles");
+
+                                    // Compute this time in milliseconds
+                                    double physicalTimeMillis = finalTime / 200000; // We assume 200MHz
+                                    System.out.println("***********************************\n" +
+                                            "Final time: " + physicalTimeMillis + " ms\n" +
+                                            "***********************************");
+
+                                    // Append result to output file
+                                    FileWriter fw = new FileWriter(outputFile, true);
+                                    BufferedWriter bw = new BufferedWriter(fw);
+                                    PrintWriter out = new PrintWriter(bw);
+                                    out.println(""+physicalTimeMillis);
+                                    out.flush();
 
-                                    // Wait for event2 to occur
-                                    // Get time of event2.
-                                    // Append to file2 time2-time1
                                 }
                             }
                         }
@@ -249,28 +292,56 @@ public class SimulatorScript extends Command  implements Runnable  {
         // Must convert in clock cycles
         // We assume 200 MHz
         // We assume time is in ms
-        long nbOfCycles = (long)(200000 * time1);
-        rc.send("1 5 " + nbOfCycles);
+        long nbOfCycles = (long)(200 * time1);
+        toServer("1 5 " + nbOfCycles, rc);
 
     }
 
     private void removeAllTransactions(RemoteConnection rc) throws RemoteConnectionException {
-        rc.send("26");
+        toServer("26", rc);
     }
 
     private void runUntilChannel(RemoteConnection rc, String channelName) throws RemoteConnectionException {
+        String realChannelName = channelName.substring(1, channelName.length());
+        int cmdVal = 17;
+        if (channelName.startsWith("r")) {
+            cmdVal = 18;
+        }
+
+        String cmd = "1 " + cmdVal + " " + realChannelName;
+        toServer(cmd, rc);
 
     }
 
-    private synchronized void waitForNextIndex() {
-        int oldValue = currentIndex;
-        while( oldValue == currentIndex) {
+    private synchronized void toServer(String s, RemoteConnection rc) throws RemoteConnectionException  {
+        while(!isReady) {
+            TraceManager.addDev("Server not ready");
             try {
-                wait();
+                sendGetSimulationTime(rc);
+                wait(250);
             } catch (InterruptedException ie) {
 
             }
         }
+        TraceManager.addDev("Sender. Cmd to server: " + s);
+        rc.send(s);
+    }
+
+    private synchronized long waitForNextTime(RemoteConnection rc) throws RemoteConnectionException {
+        int oldValue = currentIndex;
+        latestTime = -1;
+        while( latestTime == -1) {
+            TraceManager.addDev("Sender. Sending time request.");
+            sendGetSimulationTime(rc);
+            try {
+                wait(250);
+            } catch (InterruptedException ie) {
+                TraceManager.addDev("Sender. Interrupted");
+            }
+        }
+        long ret = latestTime;
+        latestTime = -1;
+        return ret;
     }
 
 
@@ -279,7 +350,9 @@ public class SimulatorScript extends Command  implements Runnable  {
     public void run() {
         try {
             while (true) {
+                //TraceManager.addDev("\tReceiver. Waiting from server input.");
                 String s = rc.readOneLine();
+                //TraceManager.addDev("\tReceiver. Received from server:" + s);
                 analyzeServerAnswer(s);
             }
         } catch (Exception e) {
@@ -288,152 +361,35 @@ public class SimulatorScript extends Command  implements Runnable  {
     }
 
 
-    protected void analyzeServerAnswer(String s) {
-        //
-        String ssxml = "";
-        int index0 = s.indexOf("<?xml");
-
-        if (index0 != -1) {
-            //
-            ssxml = s.substring(index0, s.length()) + "\n";
-        } else {
-            //
-            ssxml = ssxml + s + "\n";
-        }
-
-        index0 = ssxml.indexOf("</siminfo>");
-
-        if (index0 != -1) {
-            //
-            ssxml = ssxml.substring(0, index0+10);
-            loadXMLInfoFromServer(ssxml);
-            ssxml = "";
-        }
-    }
-
-
-    protected boolean loadXMLInfoFromServer(String xmldata) {
-        //jta.append("XML from server:" + xmldata + "\n\n");
-
-        DocumentBuilderFactory dbf;
-        DocumentBuilder db;
-
-        try {
-            dbf = DocumentBuilderFactory.newInstance();
-            db = dbf.newDocumentBuilder();
-        } catch (ParserConfigurationException e) {
-            dbf = null;
-            db = null;
-        }
-
-        if ((dbf == null) || (db == null)) {
-            return false;
-        }
-
-        ByteArrayInputStream bais = new ByteArrayInputStream(decodeString(xmldata).getBytes());
-        int i;
-
-        try {
-            // building nodes from xml String
-            Document doc = db.parse(bais);
-            NodeList nl;
-            Node node;
-
-            nl = doc.getElementsByTagName(JFrameInteractiveSimulation.SIMULATION_HEADER);
-
-            if (nl == null) {
-                return false;
+    protected synchronized void  analyzeServerAnswer(String s) {
+        if (s.startsWith("<status>")) {
+            if (s.contains("ready")) {
+                isReady = true;
+            } else {
+                isReady = false;
             }
-
-            for(i=0; i<nl.getLength(); i++) {
-                node = nl.item(i);
-                //
-                if (node.getNodeType() == Node.ELEMENT_NODE) {
-                    // create design, and get an index for it
-                    return loadConfiguration(node);
-                }
-            }
-        } catch (IOException e) {
-            TraceManager.addError("Error when parsing server info:" + e.getMessage());
-            return false;
-        } catch (SAXException saxe) {
-            TraceManager.addError("Error when parsing server info:" + saxe.getMessage());
-            TraceManager.addError("xml:" + xmldata);
-            return false;
+            notifyAll();
+            TraceManager.addDev("\tReceiver. Status: " + s);
+            return;
         }
 
-        return true;
-    }
 
-    public static String decodeString(String s)  {
-        if (s == null)
-            return s;
-        byte b[] = null;
-        try {
-            b = s.getBytes("ISO-8859-1");
-            return new String(b);
-        } catch (Exception e) {
-            return null;
+        int index0 = s.indexOf("<simtime>");
+        int index1 = s.indexOf("</simtime>");
+        if ((index0 > -1) && (index1 > -1)) {
+            String val = s.substring(index0+9, index1).trim();
+            //TraceManager.addDev("Reading simulation time:" + val);
+            writeTimeValue(val);
         }
     }
 
 
-    protected boolean loadConfiguration(Node node1) {
-        NodeList diagramNl = node1.getChildNodes();
-        if (diagramNl == null) {
-            return false;
-        }
-        Element elt;
-        Node node, node0;
-        NodeList nl;
-
-
-        try {
-            for (int j = 0; j < diagramNl.getLength(); j++) {
-                node = diagramNl.item(j);
-
-                if (node == null) {
-                    TraceManager.addDev("null node");
-                    return false;
-                }
-
-                if (node.getNodeType() == Node.ELEMENT_NODE) {
-                    elt = (Element) node;
-
-                    // Status
-                    if (elt.getTagName().compareTo(JFrameInteractiveSimulation.SIMULATION_GLOBAL) == 0) {
-
-                        nl = elt.getElementsByTagName("simtime");
-                        if ((nl != null) && (nl.getLength() > 0)) {
-                            node0 = nl.item(0);
-                            if (node0.getTextContent() != null) {
-                                String val = node0.getTextContent();
-                                //Write value to table
-                                writeTimeValue(val);
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            return false;
-        }
-
-        return true;
-    }
-
     private synchronized void writeTimeValue(String val) {
-        if (times == null) {
-            return;
-        }
-        try {
-            long valL = Long.decode(val);
-            times[currentIndex] = valL;
-            currentIndex ++;
-            notify();
-        } catch (Exception e) {
 
-        }
+        long valL = Long.decode(val);
+        TraceManager.addDev("\tReceiver. Received simulation time:" + valL);
+        latestTime = valL;
+        notifyAll();
     }
 
 
diff --git a/src/main/java/myutil/GraphicLib.java b/src/main/java/myutil/GraphicLib.java
index 71672b7218ac8828bc40baf7f135e7c8a9c73397..12c0165d06e802b6d8e8d6b6830f72234bb1b976 100644
--- a/src/main/java/myutil/GraphicLib.java
+++ b/src/main/java/myutil/GraphicLib.java
@@ -145,12 +145,12 @@ public final class GraphicLib {
         g2.drawLine(x1, y1, x2, y2);
         g2.setStroke(normalStroke);
 
-        // extremite 1
+        // end 1
         if ((type == 0) || (type == 2)) {
             drawArrow(g, x1, y1, x2, y2, head, length, full);
         }
 
-        // extremite 2
+        // end 2
         if ((type == 0) || (type == 1)) {
             drawArrow(g, x2, y2, x1, y1, head, length, full);
         }
diff --git a/src/main/java/myutil/MyMath.java b/src/main/java/myutil/MyMath.java
index f780ca1bbf3cf6281f045eb3b0ea335c9332e84e..da0def5cb4ce6d996b2245f8bf4c1a9cd392780f 100644
--- a/src/main/java/myutil/MyMath.java
+++ b/src/main/java/myutil/MyMath.java
@@ -42,7 +42,7 @@
 package myutil;
 
 import java.util.Random;
-import org.apache.commons.math3.distribution.LogNormalDistribution;
+import org.apache.commons.math3.distribution.*;
 
 /**
  * Class MyMath
@@ -142,6 +142,27 @@ public class MyMath {
         return val;
     }
 
+    public static double exponentialDistribution(double a, double b, double mean) {
+        ExponentialDistribution ed = new ExponentialDistribution(mean);
+        double val = ed.sample();
+        val += a;
+        if (val > b) {
+            return exponentialDistribution(a, b, mean);
+        }
+        return val;
+    }
+
+    public static double weibullDistribution(double a, double b, double shape, double scale) {
+        WeibullDistribution wd = new WeibullDistribution(shape, scale);
+        double val = wd.sample();
+        val += a;
+        if (val > b) {
+            return weibullDistribution(a, b, shape, scale);
+        }
+        return val;
+    }
+
+
 
 
   
diff --git a/src/main/java/ui/AvatarDesignPanelTranslator.java b/src/main/java/ui/AvatarDesignPanelTranslator.java
index a4b55ed06d63fa8711c61bbf2b943fca084a0f86..85e2adfac41d7a6f4c97ed2dc47a814e0f544a6b 100644
--- a/src/main/java/ui/AvatarDesignPanelTranslator.java
+++ b/src/main/java/ui/AvatarDesignPanelTranslator.java
@@ -1716,15 +1716,22 @@ public class AvatarDesignPanelTranslator {
 
             // Must handle distribution law and extra attributes
             int law = connector.getEffectiveDelayDistributionLaw();
-            String extraArg = connector.getExtraDelay1();
+            String extraArg1 = connector.getExtraDelay1();
 
-            error = AvatarSyntaxChecker.isAValidIntExpr(spec, block, extraArg);
+
+            error = AvatarSyntaxChecker.isAValidIntExpr(spec, block, extraArg1);
 
             if (error < 0) {
-                makeError(error, connector.tdp, block, connector, "invalid extra attribute 1", extraArg);
+                makeError(error, connector.tdp, block, connector, "invalid extra attribute 1", extraArg1);
             } else {
-                //TraceManager.addDev("Adding min and max delay AND Distribution law: " + law + " attr=" + extraArg);
-                transition.setDistributionLaw(law, extraArg);
+                String extraArg2 = connector.getExtraDelay2();
+                error = AvatarSyntaxChecker.isAValidIntExpr(spec, block, extraArg2);
+                if (error < 0) {
+                    makeError(error, connector.tdp, block, connector, "invalid extra attribute 2", extraArg2);
+                } else {
+                    //TraceManager.addDev("Adding min and max delay AND Distribution law: " + law + " attr=" + extraArg);
+                    transition.setDistributionLaw(law, extraArg1, extraArg2);
+                }
             }
 
         }
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index bff7ba66bbd214402e1bedf7f773b882669a1d8a..9148f0bdad6d89cf387bb7123c8a9befeb16e916 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -3189,7 +3189,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return b;
     }
 
-    protected boolean saveProject() {
+    public String setFileName(String fileName) {
+        File f = new File(fileName);
+        file = FileUtils.addFileExtensionIfMissing(f, TFileFilter.getExtension());
+        return file.getName();
+    }
+
+    public String getFileName() {
+        return file.getAbsolutePath();
+    }
+
+    public boolean saveProject() {
         if (file == null) {
             if (dir != null)
                 createFileDialog();
@@ -5045,7 +5055,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         JDialogAvatarModelChecker jmc = new JDialogAvatarModelChecker(frame, this, "Avatar: Model Checking", gtm.getAvatarSpecification(),
                 SpecConfigTTool.TGraphPath, experimentalOn);
         // jmc.setSize(550, 600);
-        GraphicLib.centerOnParent(jmc, 650, 600);
+        GraphicLib.centerOnParent(jmc, 650, 850);
         jmc.setVisible(true);
     }
 
@@ -8200,6 +8210,10 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         mainTabbedPane.setTitleAt(tabs.size() - 1, mainTabbedPane.getTitleAt(index) + "_" + s);
     }
 
+    public void removeCurrentTab() {
+        requestRemoveTab(mainTabbedPane.getSelectedIndex());
+    }
+
     public void requestRemoveTab(int index) {
         if (index >= tabs.size()) {
             return;
@@ -9426,7 +9440,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                 JMenuItem item = (JMenuItem) e.getSource();
                 String ac = item.getActionCommand();
                 if (ac.equals("Rename")) {
-                    mgui.requestRenameTab(mainTabbedPane.getSelectedIndex());
+                    mgui.removeCurrentTab();
                 } else if (ac.equals("Remove")) {
                     mgui.requestRemoveTab(mainTabbedPane.getSelectedIndex());
                 } else if (ac.equals("Move to the left")) {
diff --git a/src/main/java/ui/avatarrd/AvatarRDProperty.java b/src/main/java/ui/avatarrd/AvatarRDProperty.java
index ade55894fc782996d6c00b5530c1e64c81a34c14..5d298fb614a1c43402be570c2d338c7ed3f2cfa0 100755
--- a/src/main/java/ui/avatarrd/AvatarRDProperty.java
+++ b/src/main/java/ui/avatarrd/AvatarRDProperty.java
@@ -1,26 +1,26 @@
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- * 
+ *
  * ludovic.apvrille AT enst.fr
- * 
+ *
  * This software is a computer program whose purpose is to allow the
  * edition of TURTLE analysis, design and deployment diagrams, to
  * allow the generation of RT-LOTOS or Java code from this diagram,
  * and at last to allow the analysis of formal validation traces
  * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
  * from INRIA Rhone-Alpes.
- * 
+ *
  * This software is governed by the CeCILL  license under French law and
  * abiding by the rules of distribution of free software.  You can  use,
  * modify and/ or redistribute the software under the terms of the CeCILL
  * license as circulated by CEA, CNRS and INRIA at the following URL
  * "http://www.cecill.info".
- * 
+ *
  * As a counterpart to the access to the source code and  rights to copy,
  * modify and redistribute granted by the license, users are provided only
  * with a limited warranty  and the software's author,  the holder of the
  * economic rights,  and the successive licensors  have only  limited
  * liability.
- * 
+ *
  * In this respect, the user's attention is drawn to the risks associated
  * with loading,  using,  modifying and/or developing or reproducing the
  * software by the user in light of its specific status of free software,
@@ -31,43 +31,43 @@
  * requirements in conditions enabling the security of their systems and/or
  * data to be ensured and,  more generally, to use and operate it in the
  * same conditions as regards security.
- * 
+ *
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
 
-
-
 package ui.avatarrd;
 
 
 import myutil.GraphicLib;
-//import myutil.TraceManager;
 import ui.*;
 import ui.util.IconManager;
 
 import javax.swing.*;
 import java.awt.*;
 
+//import myutil.TraceManager;
+
 /**
  * Class AvatarRDProperty
  * Avatar property: to be used in avatar requirement diagrams
  * Creation: 20/04/2010
- * @version 1.0 20/04/2010
+ *
  * @author Ludovic APVRILLE
+ * @version 1.0 20/04/2010
  */
 public class AvatarRDProperty extends TGCScalableWithInternalComponent implements TGAutoAdjust {
     public String oldValue;
-//    protected int textX = 5;
+    //    protected int textX = 5;
 //    protected int textY = 22;
     protected int lineHeight = 30;
     private double dlineHeight = 0.0;
     //protected int startFontSize = 10;
     protected Graphics graphics;
-    
 
-//    private Font myFont, myFontB;
+
+    //    private Font myFont, myFontB;
     //private int maxFontSize = 30;
 //    private int minFontSize = 4;
     private int currentFontSize = -1;
@@ -81,16 +81,16 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
     private int iconSize = 18;
     //private boolean iconIsDrawn = false;
 
-    public AvatarRDProperty(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
+    public AvatarRDProperty(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);
-        
+
         textX = 5;
         textY = 22;
         initScaling(150, lineHeight);
-        
+
         oldScaleFactor = tdp.getZoom();
         dlineHeight = lineHeight * oldScaleFactor;
-        lineHeight = (int)dlineHeight;
+        lineHeight = (int) dlineHeight;
         dlineHeight = dlineHeight - lineHeight;
 
         minWidth = 10;
@@ -140,39 +140,39 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
 
         actionOnAdd();
     }
-    
+
     //Issue #31
     @Override
-    public void internalDrawing(Graphics g)
-    {
-    	//Rectangle
-    	g.drawRect(x, y, width, height);
-    	g.drawLine(x, y + lineHeight, x + width, y + lineHeight);
-    	 
-    	//Filling
-    	g.setColor(ColorManager.AVATAR_REQUIREMENT_TOP);
-      g.fillRect(x+1, y+1, width-1, lineHeight-1);
-      g.setColor(ColorManager.AVATAR_REQUIREMENT_ATTRIBUTES);
-      g.fillRect(x+1, y+1+lineHeight, width-1, height-1-lineHeight);
-      ColorManager.setColor(g, getState(), 0);
-      
-      //Readability Check
-      if (!isTextReadable(g))
-    	  return;
-      //Icon
-      g.drawImage(scale(IconManager.img5100), x + width - scale(iconSize + 2), y + scale(3), Color.yellow, null);
-      
-      //Strings
-      Font font = g.getFont();
-      currentFontSize = font.getSize();
-      g.setFont(font.deriveFont(Font.BOLD));
-      drawLimitedString(g, PROPERTY, x, y + currentFontSize , width, 1);
-      g.setFont(font.deriveFont(Font.PLAIN));
-      drawLimitedString(g, value, x, y + currentFontSize * 2, width, 1);
+    public void internalDrawing(Graphics g) {
+        graphics = g;
+        //Rectangle
+        g.drawRect(x, y, width, height);
+        g.drawLine(x, y + lineHeight, x + width, y + lineHeight);
+
+        //Filling
+        g.setColor(ColorManager.AVATAR_REQUIREMENT_TOP);
+        g.fillRect(x + 1, y + 1, width - 1, lineHeight - 1);
+        g.setColor(ColorManager.AVATAR_REQUIREMENT_ATTRIBUTES);
+        g.fillRect(x + 1, y + 1 + lineHeight, width - 1, height - 1 - lineHeight);
+        ColorManager.setColor(g, getState(), 0);
+
+        //Readability Check
+        if (!isTextReadable(g))
+            return;
+        //Icon
+        g.drawImage(scale(IconManager.img5100), x + width - scale(iconSize + 2), y + scale(3), Color.yellow, null);
+
+        //Strings
+        Font font = g.getFont();
+        currentFontSize = font.getSize();
+        g.setFont(font.deriveFont(Font.BOLD));
+        drawLimitedString(g, PROPERTY, x, y + currentFontSize, width, 1);
+        g.setFont(font.deriveFont(Font.PLAIN));
+        drawLimitedString(g, value, x, y + currentFontSize * 2, width, 1);
     }
-    
-    
-//    public void internalDrawing(Graphics g) {
+
+
+    //    public void internalDrawing(Graphics g) {
 //        Font f = g.getFont();
 //        
 //        //Font fold = f; FIXME: unused 
@@ -241,31 +241,34 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
             if (hasFather()) {
                 texti = getTopLevelName() + " / " + diagramText;
             }
-            String s = (String)JOptionPane.showInputDialog(frame, texti,
-                                                           "setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
-                                                           null,
-                                                           getValue());
+            String s = (String) JOptionPane.showInputDialog(frame, texti,
+                    "setting value", JOptionPane.PLAIN_MESSAGE, IconManager.imgic101,
+                    null,
+                    getValue());
 
             if ((s != null) && (s.length() > 0) && (!s.equals(oldValue))) {
                 //boolean b;
                 if (!TAttribute.isAValidId(s, false, false, false)) {
                     JOptionPane.showMessageDialog(frame,
-                                                  "Could not change the name of the Property: the new name is not a valid name",
-                                                  "Error",
-                                                  JOptionPane.INFORMATION_MESSAGE);
+                            "Could not change the name of the Property: the new name is not a valid name",
+                            "Error",
+                            JOptionPane.INFORMATION_MESSAGE);
                     return false;
                 }
 
                 if (!tdp.isRequirementNameUnique(s)) {
                     JOptionPane.showMessageDialog(frame,
-                                                  "Could not change the name of the Property: the new name is already in use",
-                                                  "Error",
-                                                  JOptionPane.INFORMATION_MESSAGE);
+                            "Could not change the name of the Property: the new name is already in use",
+                            "Error",
+                            JOptionPane.INFORMATION_MESSAGE);
                     return false;
                 }
 
 
-                int size = graphics.getFontMetrics().stringWidth(s) + iconSize + 5;
+                int size = minWidth;
+                if (graphics != null) {
+                    size = graphics.getFontMetrics().stringWidth(s) + iconSize + 5;
+                }
                 minDesiredWidth = Math.max(size, minWidth);
                 if (minDesiredWidth != width) {
                     newSizeForSon(null);
@@ -276,9 +279,9 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
                     return true;
                 } else {
                     JOptionPane.showMessageDialog(frame,
-                                                  "Could not change the name of the Property: this name is already in use",
-                                                  "Error",
-                                                  JOptionPane.INFORMATION_MESSAGE);
+                            "Could not change the name of the Property: this name is already in use",
+                            "Error",
+                            JOptionPane.INFORMATION_MESSAGE);
                     setValue(oldValue);
                 }
             }
@@ -306,9 +309,9 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
       return true;
       }*/
     @Override
-    public void rescale(double scaleFactor){
+    public void rescale(double scaleFactor) {
         dlineHeight = (lineHeight + dlineHeight) / oldScaleFactor * scaleFactor;
-        lineHeight = (int)(dlineHeight);
+        lineHeight = (int) (dlineHeight);
         dlineHeight = dlineHeight - lineHeight;
         minHeight = lineHeight;
 
@@ -328,7 +331,7 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
     }
 
     @Override
-    public  int getType() {
+    public int getType() {
         return TGComponentManager.AVATARRD_PROPERTY;
     }
 
@@ -357,9 +360,10 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
        }*/
     @Override
     public String toString() {
-        String ret =  getValue() + PROPERTY;
+        String ret = getValue() + PROPERTY;
         return ret;
     }
+
     @Override
     public void autoAdjust(int mode) {
         //
@@ -369,9 +373,9 @@ public class AvatarRDProperty extends TGCScalableWithInternalComponent implement
         }
 
         Font f = graphics.getFont();
-        Font f0 = f.deriveFont((float)currentFontSize);
+        Font f0 = f.deriveFont((float) currentFontSize);
         Font f1 = f0.deriveFont(Font.BOLD);
-        Font f2 = f.deriveFont((float)(currentFontSize - 2));
+        Font f2 = f.deriveFont((float) (currentFontSize - 2));
 
         // Must find for both modes which width is desirable
         String s0, s1;
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
index 362ba09c592f67bfc5479b255101ffd471dc728c..453a64eb12868248a0a429e7847dd2690af94051 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDConnector.java
@@ -214,6 +214,7 @@ public class AvatarSMDConnector extends TGConnectorWithCommentConnectionPoints i
         return getAvatarSMDTransitionInfo().getDelayDistributionLaw();
     }
     public String getExtraDelay1() { return getAvatarSMDTransitionInfo().getExtraDelay1(); }
+    public String getExtraDelay2() { return getAvatarSMDTransitionInfo().getExtraDelay2(); }
 
     public String getComputeMinDelay() {
         return getAvatarSMDTransitionInfo().getComputeMinDelay();
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
index 296b602e041d76204f3aa94b05752465aaa0ec97..a05ec28bdb1335602028fbc1241e3ea8d348816b 100755
--- a/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDTransitionInfo.java
@@ -101,6 +101,7 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
     private final RangeExpression afterDelay;
     private final RangeExpression computeDelay;
     private final Expression extraDelay1;
+    private final Expression extraDelay2;
     private final Expression delayDistributionLaw;
 
 
@@ -136,6 +137,7 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
         guard = new Expression( NULL_GUARD_EXPR, NULL_GUARD_EXPR, null );
         afterDelay = new RangeExpression( NULL_EXPR, NULL_EXPR, NULL_EXPR, "after (%s, %s)", null , "after(%s)");
         extraDelay1 = new Expression( NULL_EXPR, NULL_EXPR, "extraDelay1=%s" );
+        extraDelay2 = new Expression( NULL_EXPR, NULL_EXPR, "extraDelay2=%s" );
         delayDistributionLaw = new Expression( ZERO_EXPR, ZERO_EXPR, "delayDistributionLaw=%s" );
         computeDelay = new RangeExpression( NULL_EXPR, NULL_EXPR, NULL_EXPR, "computeFor (%s, %s)", null, "computeFor (%s)");
         probability = new Expression( NULL_EXPR, NULL_EXPR, "weight=%s" );
@@ -501,6 +503,7 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
 																	getAfterMaxDelay(),
                                                                     getDelayDistributionLaw(),
                                                                     getExtraDelay1(),
+                                                                    getExtraDelay2(),
 //																	getComputeMinDelay(),
 //																	getComputeMaxDelay(),
 																	listOfActions,
@@ -533,16 +536,24 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
             extraDelay1.setText(retExtra );
         } catch (Exception e) {
         }
+        retExtra = jdat.getExtraDelay2().trim();
+        try {
+            double extra2 = Double.parseDouble(retExtra);
+            extraDelay2.setText(retExtra );
+        } catch (Exception e) {
+        }
 
 
         delayDistributionLaw.setText( "" + jdat.getDistributionLaw() );
 
-
-        if (AvatarTransition.NB_OF_EXTRA_ATTRIBUTES[jdat.getDistributionLaw()] > 0 ) {
+        /*if (AvatarTransition.NB_OF_EXTRA_ATTRIBUTES[jdat.getDistributionLaw()] > 0 ) {
             if (extraDelay1.getText().length() == 0) {
                 extraDelay1.setText(afterDelay.getMinExpression().getText());
             }
-        }
+            if (extraDelay2.getText().length() == 0) {
+                extraDelay2.setText(afterDelay.getMinExpression().getText());
+            }
+        }*/
 
 //        computeDelay.getMinExpression().setText( jdat.getComputeMin().trim() );
 //        computeDelay.getMaxExpression().setText( jdat.getComputeMax().trim() );
@@ -578,6 +589,7 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
         sb.append( toXML( "afterMin", afterDelay.getMinExpression() ) );
         sb.append( toXML( "afterMax", afterDelay.getMaxExpression() ) );
         sb.append( toXML( "extraDelay1", extraDelay1 ) );
+        sb.append( toXML( "extraDelay2", extraDelay2 ) );
         sb.append( toXML( "delayDistributionLaw", delayDistributionLaw ) );
         sb.append( toXML( "computeMin", computeDelay.getMinExpression() ) );
         sb.append( toXML( "computeMax", computeDelay.getMaxExpression() ) );
@@ -713,10 +725,23 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
                                     // Issue #69 loading enabling parameters
                                     s = elt.getAttribute("enabled");
 
+                                    if ( s != null && !s.isEmpty() ) {
+                                        extraDelay1.setEnabled(Boolean.parseBoolean(s));
+                                    }
+//
+                                }
+                            }
+
+                            if (elt.getTagName().equals("extraDelay2")) {
+                                s = elt.getAttribute("value");
+                                if (s != null) {
+                                    extraDelay2.setText( s );
+
+                                    // Issue #69 loading enabling parameters
                                     s = elt.getAttribute("enabled");
 
                                     if ( s != null && !s.isEmpty() ) {
-                                        extraDelay1.setEnabled(Boolean.parseBoolean(s));
+                                        extraDelay2.setEnabled(Boolean.parseBoolean(s));
                                     }
 //
                                 }
@@ -875,6 +900,10 @@ public class AvatarSMDTransitionInfo extends TGCWithoutInternalComponent impleme
         return extraDelay1.getText();
     }
 
+    public String getExtraDelay2() {
+        return extraDelay2.getText();
+    }
+
 
     /**
      * Issue #69
diff --git a/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java b/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java
index f454ef771a6760d77788cc3bd652fe9bb37e09f9..d1350847477ce89b48a4d6beb1eea684419388b8 100644
--- a/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java
+++ b/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java
@@ -1,26 +1,26 @@
 /* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
- * 
+ *
  * ludovic.apvrille AT enst.fr
- * 
+ *
  * This software is a computer program whose purpose is to allow the
  * edition of TURTLE analysis, design and deployment diagrams, to
  * allow the generation of RT-LOTOS or Java code from this diagram,
  * and at last to allow the analysis of formal validation traces
  * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
  * from INRIA Rhone-Alpes.
- * 
+ *
  * This software is governed by the CeCILL  license under French law and
  * abiding by the rules of distribution of free software.  You can  use,
  * modify and/ or redistribute the software under the terms of the CeCILL
  * license as circulated by CEA, CNRS and INRIA at the following URL
  * "http://www.cecill.info".
- * 
+ *
  * As a counterpart to the access to the source code and  rights to copy,
  * modify and redistribute granted by the license, users are provided only
  * with a limited warranty  and the software's author,  the holder of the
  * economic rights,  and the successive licensors  have only  limited
  * liability.
- * 
+ *
  * In this respect, the user's attention is drawn to the risks associated
  * with loading,  using,  modifying and/or developing or reproducing the
  * software by the user in light of its specific status of free software,
@@ -31,48 +31,15 @@
  * requirements in conditions enabling the security of their systems and/or
  * data to be ensured and,  more generally, to use and operate it in the
  * same conditions as regards security.
- * 
+ *
  * The fact that you are presently reading this means that you have had
  * knowledge of the CeCILL license and that you accept its terms.
  */
 
 package ui.simulationtraceanalysis;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.image.BufferedImage;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.FilterWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Vector;
-
-import javax.imageio.ImageIO;
-import javax.swing.DefaultListModel;
-import javax.swing.JApplet;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JProgressBar;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-
-import org.apache.commons.math3.geometry.spherical.twod.Vertex;
-import org.apache.derby.tools.sysinfo;
-import org.graphstream.graph.Edge;
+import com.mxgraph.layout.hierarchical.mxHierarchicalLayout;
+import com.mxgraph.swing.mxGraphComponent;
 import org.jgrapht.Graph;
 import org.jgrapht.GraphPath;
 import org.jgrapht.alg.shortestpath.AllDirectedPaths;
@@ -80,76 +47,30 @@ import org.jgrapht.alg.shortestpath.DijkstraShortestPath;
 import org.jgrapht.ext.JGraphXAdapter;
 import org.jgrapht.graph.DefaultDirectedGraph;
 import org.jgrapht.graph.DefaultEdge;
-import org.jgrapht.io.ComponentNameProvider;
-import org.jgrapht.io.EdgeProvider;
-import org.jgrapht.io.ExportException;
-import org.jgrapht.io.GraphImporter;
-import org.jgrapht.io.GraphMLExporter;
-import org.jgrapht.io.GraphMLImporter;
-import org.jgrapht.io.ImportException;
-import org.jgrapht.io.VertexProvider;
-
-import com.mxgraph.layout.mxCircleLayout;
-import com.mxgraph.layout.mxIGraphLayout;
-import com.mxgraph.layout.hierarchical.mxHierarchicalLayout;
-import com.mxgraph.swing.mxGraphComponent;
-import com.mxgraph.util.mxCellRenderer;
-import com.sun.prism.paint.Color;
-
-import tmltranslator.HwA;
-import tmltranslator.HwCommunicationNode;
-import tmltranslator.HwLink;
-import tmltranslator.HwNode;
-import tmltranslator.TMLActivity;
-import tmltranslator.TMLActivityElement;
-import tmltranslator.TMLChannel;
-import tmltranslator.TMLElement;
-import tmltranslator.TMLError;
-import tmltranslator.TMLMapping;
-import tmltranslator.TMLReadChannel;
-import tmltranslator.TMLRequest;
-import tmltranslator.TMLSendEvent;
-import tmltranslator.TMLTask;
-import tmltranslator.TMLWaitEvent;
-import tmltranslator.TMLWriteChannel;
+import org.jgrapht.io.*;
+import tmltranslator.*;
 import tmltranslator.tomappingsystemc2.DiploSimulatorCodeGenerator;
 import ui.TGComponent;
 import ui.TGConnectingPoint;
 import ui.TGConnector;
 import ui.TMLComponentDesignPanel;
 import ui.interactivesimulation.SimulationTransaction;
-import ui.tmlad.TMLADActionState;
-import ui.tmlad.TMLADChoice;
-import ui.tmlad.TMLADDecrypt;
-import ui.tmlad.TMLADDelay;
-import ui.tmlad.TMLADDelayInterval;
-import ui.tmlad.TMLADEncrypt;
-import ui.tmlad.TMLADExecC;
-import ui.tmlad.TMLADExecCInterval;
-import ui.tmlad.TMLADExecI;
-import ui.tmlad.TMLADExecIInterval;
-import ui.tmlad.TMLADForEverLoop;
-import ui.tmlad.TMLADForLoop;
-import ui.tmlad.TMLADForStaticLoop;
-import ui.tmlad.TMLADNotifiedEvent;
-import ui.tmlad.TMLADRandom;
-import ui.tmlad.TMLADReadChannel;
-import ui.tmlad.TMLADReadRequestArg;
-import ui.tmlad.TMLADSelectEvt;
-import ui.tmlad.TMLADSendEvent;
-import ui.tmlad.TMLADSendRequest;
-import ui.tmlad.TMLADSequence;
-import ui.tmlad.TMLADStartState;
-import ui.tmlad.TMLADStopState;
-import ui.tmlad.TMLADUnorderedSequence;
-import ui.tmlad.TMLADWaitEvent;
-import ui.tmlad.TMLADWriteChannel;
+import ui.tmlad.*;
 import ui.tmlcompd.TMLCPrimitivePort;
 
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.*;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Class DirectedGraphTranslator: this class generate the directed graph
  * equivalent for the sysml model
- * 
+ * <p>
  * 23/09/2019
  *
  * @author Maysam Zoor
@@ -261,7 +182,7 @@ public class DirectedGraphTranslator extends JApplet {
 
     @SuppressWarnings("deprecation")
     public DirectedGraphTranslator(JFrameLatencyDetailedAnalysis jFrameLatencyDetailedAnalysis, JFrameCompareLatencyDetail jframeCompareLatencyDetail,
-            TMLMapping<TGComponent> tmap1, List<TMLComponentDesignPanel> cpanels1, int i) {
+                                   TMLMapping<TGComponent> tmap1, List<TMLComponentDesignPanel> cpanels1, int i) {
 
         tmap = tmap1;
         setCpanels(cpanels1);
@@ -288,18 +209,18 @@ public class DirectedGraphTranslator extends JApplet {
         /*
          * JGraphXAdapter<String, DefaultEdge> graphAdapter = new JGraphXAdapter<String,
          * DefaultEdge>(g);
-         * 
+         *
          * mxHierarchicalLayout layout = new mxHierarchicalLayout(graphAdapter);
-         * 
+         *
          * layout.setInterHierarchySpacing(100); layout.setInterRankCellSpacing(100);
          * layout.setIntraCellSpacing(100);
-         * 
+         *
          * layout.execute(graphAdapter.getDefaultParent());
-         * 
+         *
          * scrollPane.setViewportView(new mxGraphComponent(graphAdapter));
-         * 
+         *
          * scrollPane.setVisible(true);
-         * 
+         *
          * scrollPane.revalidate(); scrollPane.repaint(); frame = new
          * JFrame("The Sys-ML Model As Directed Graph"); frame.add(scrollPane);
          * frame.pack();
@@ -795,9 +716,9 @@ public class DirectedGraphTranslator extends JApplet {
                 /*
                  * for (TMLComponentDesignPanel dpPanel : getCpanels()) { String[] taskpanel =
                  * task.getName().split("__");
-                 * 
+                 *
                  * if (dpPanel.getNameOfTab().equals(taskpanel[0])) { tmlcdp = dpPanel; }
-                 * 
+                 *
                  * }
                  */
                 // get the names and params of send events per task and their corresponding wait
@@ -975,7 +896,7 @@ public class DirectedGraphTranslator extends JApplet {
                             g.addEdge(preEventName, taskEndName);
                         }
 
-                        @SuppressWarnings({ "unchecked", "rawtypes" })
+                        @SuppressWarnings({"unchecked", "rawtypes"})
                         AllDirectedPaths<String, DefaultEdge> allPaths = new AllDirectedPaths<String, DefaultEdge>(g);
                         if (orderedSequenceList.size() > 0) {
 
@@ -1081,7 +1002,7 @@ public class DirectedGraphTranslator extends JApplet {
                                                                                 if (!adjacentsequenceListEntryValue.getKey()
                                                                                         .equals(sequenceListEntry.getKey())
                                                                                         && !adjacentsequenceListEntryValue.getKey()
-                                                                                                .equals(othersequenceListEntryValue.getKey())) {
+                                                                                        .equals(othersequenceListEntryValue.getKey())) {
 
                                                                                     if (path.get(i).getVertexList()
                                                                                             .contains(adjacentsequenceListEntryValue)) {
@@ -1682,9 +1603,7 @@ public class DirectedGraphTranslator extends JApplet {
 
                                 }
 
-                            }
-
-                            else {
+                            } else {
                                 HashSet<String> writeChVertex = new HashSet<String>();
                                 writeChVertex.add(chwriteName);
 
@@ -1737,7 +1656,7 @@ public class DirectedGraphTranslator extends JApplet {
 
                                 /*
                                  * if (g.containsVertex(chwriteName))
-                                 * 
+                                 *
                                  * { g.addEdge(chwriteName, eventName); }
                                  */
 
@@ -1948,7 +1867,7 @@ public class DirectedGraphTranslator extends JApplet {
     // save graph in .graphml format
     public void exportGraph(String filename) throws ExportException, IOException {
 
-        @SuppressWarnings({ "rawtypes", "unchecked" })
+        @SuppressWarnings({"rawtypes", "unchecked"})
         GraphMLExporter<String, DefaultEdge> gmlExporter = new GraphMLExporter();
 
         ComponentNameProvider<String> vertexIDProvider = new ComponentNameProvider<String>() {
@@ -2245,9 +2164,7 @@ public class DirectedGraphTranslator extends JApplet {
                                     }
 
                                 }
-                            }
-
-                            else if (((st.deviceName.equals(task2DeviceName)) || st.deviceName.equals(task1DeviceName)
+                            } else if (((st.deviceName.equals(task2DeviceName)) || st.deviceName.equals(task1DeviceName)
                                     || devicesToBeConsidered.contains(deviceName)) && !st.id.equals(idTask1) && !st.id.equals(idTask2)) {
                                 delayDueTosimTraces.add(st);
 
@@ -2495,9 +2412,7 @@ public class DirectedGraphTranslator extends JApplet {
 
                             }
 
-                        }
-
-                        else if (((st.deviceName.equals(task2DeviceName)) || st.deviceName.equals(task1DeviceName)
+                        } else if (((st.deviceName.equals(task2DeviceName)) || st.deviceName.equals(task1DeviceName)
                                 || devicesToBeConsidered.contains(deviceName)) && !st.id.equals(idTask1) && !st.id.equals(idTask2)) {
                             delayDueTosimTraces.add(st);
 
diff --git a/src/main/java/ui/ucd/TGConnectorUC.java b/src/main/java/ui/ucd/TGConnectorUC.java
index 9b100d0c63b61fcb1ce3d9b738ae850d56152b7f..69e81ae21af04a0e4103812a76dd8d9e85bf1ccb 100755
--- a/src/main/java/ui/ucd/TGConnectorUC.java
+++ b/src/main/java/ui/ucd/TGConnectorUC.java
@@ -68,7 +68,7 @@ public  abstract class TGConnectorUC extends TGConnector {
     @Override
     protected void drawLastSegment(Graphics g, int x1, int y1, int x2, int y2){
         //g.drawLine(x1, y1, x2, y2);
-        GraphicLib.dashedArrowWithLine(g, 1, 1, 0, x1, y1, x2, y2, false);
+        GraphicLib.dashedArrowWithLine(g, 1, 1, 12, x1, y1, x2, y2, false);
         
         // Indicate semantics 
         w  = g.getFontMetrics().stringWidth(value);
diff --git a/src/main/java/ui/ucd/UCDUseCase.java b/src/main/java/ui/ucd/UCDUseCase.java
index a0eca17301452c0aea0f9f0091d0509698f2e20a..70ed54f59d9375852bc99b0abdec9285b89cf67e 100755
--- a/src/main/java/ui/ucd/UCDUseCase.java
+++ b/src/main/java/ui/ucd/UCDUseCase.java
@@ -200,7 +200,7 @@ public class UCDUseCase extends TGCScalableWithoutInternalComponent {
     @Override
 	protected String translateExtraParam() {
         StringBuffer sb = new StringBuffer("<extraparam>\n");
-        sb.append("<info extension=\"" + extension + "\" ");
+        sb.append("<info extension=\"" + GTURTLEModeling.transformString(extension) + "\" ");
         sb.append("/>\n");
         sb.append("</extraparam>\n");
         return new String(sb);
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index ce4354100c51f3783cc7ca6e6d66466a663e4a60..c63fdf18730be3b53fab1f673c16f07b0843968e 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,8 +50,8 @@ package ui.util;
  */
 public class DefaultText {
 
-    public static String BUILD = "13422";
-    public static String DATE = "2020/06/04 03:12:51 CET";
+    public static String BUILD = "13432";
+    public static String DATE = "2020/06/10 03:13:20 CET";
 
     public static StringBuffer sbAbout = makeAbout();
 
diff --git a/src/main/java/ui/window/JDialogAvatarModelChecker.java b/src/main/java/ui/window/JDialogAvatarModelChecker.java
index a29cae0518c4499558814c853c17e8fe8aa552d8..bb9327efbd3eebb6bcfa67b8345231619997b3c4 100644
--- a/src/main/java/ui/window/JDialogAvatarModelChecker.java
+++ b/src/main/java/ui/window/JDialogAvatarModelChecker.java
@@ -436,7 +436,7 @@ public class JDialogAvatarModelChecker extends javax.swing.JFrame implements Act
                 customChecks.add(cqb);
             }
             JScrollPane jsp = new JScrollPane(jpadvancedQ, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-            jsp.setPreferredSize(new Dimension(500, 150));
+            jsp.setPreferredSize(new Dimension(500, 120));
             cadvanced.gridheight = 10;
             cadvanced.anchor = GridBagConstraints.WEST;
             cadvanced.fill = GridBagConstraints.HORIZONTAL; 
diff --git a/src/main/java/ui/window/JDialogAvatarTransition.java b/src/main/java/ui/window/JDialogAvatarTransition.java
index 0c68253ac895fa33d72edb8a12237eb061488905..218a0977c969330d125a8bbd149d1f59eda966f9 100644
--- a/src/main/java/ui/window/JDialogAvatarTransition.java
+++ b/src/main/java/ui/window/JDialogAvatarTransition.java
@@ -90,7 +90,7 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
 
     private Vector<Vector<Expression>> actionRows;
     //private Vector<String> actions;
-    private String guard, afterMin, afterMax, extraDelay1, /*computeMin, computeMax,*/ probability;
+    private String guard, afterMin, afterMax, extraDelay1, extraDelay2, /*computeMin, computeMax,*/ probability;
     private int distributionLaw;
     private List<TAttribute> myAttributes;
     private List<AvatarMethod> myMethods;
@@ -106,8 +106,9 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
 //    private JPanel panel2;
 
     // Panel1
-    private JTextField guardT, afterMinT, afterMaxT, extraDelay1T, /*computeMinT, computeMaxT,*/ probabilityT;
+    private JTextField guardT, afterMinT, afterMaxT, extraDelay1T, extraDelay2T,/*computeMinT, computeMaxT,*/ probabilityT;
     private JLabel extraDelay1L;
+	private JLabel extraDelay2L;
     private JComboBox<String> distributionLawB;
     
     private JTable actionsTable;
@@ -135,6 +136,7 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
     								String _afterMax,
 								  int _distributionLaw,
 								  String _extraDelay1,
+									   String _extraDelay2,
 								  /* String _computeMin, String _computeMax,*/ 
     								Vector<Expression> _actions,
     								List<TAttribute> _myAttributes, 
@@ -149,6 +151,7 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
         afterMin = _afterMin;
         afterMax = _afterMax;
         extraDelay1 = _extraDelay1;
+		extraDelay2 = _extraDelay2;
         distributionLaw = _distributionLaw;
 //        computeMin = _computeMin;
 //        computeMax = _computeMax;
@@ -290,14 +293,24 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
         distributionLawB = new JComboBox<>(AvatarTransition.DISTRIBUTION_LAWS);
         distributionLawB.setSelectedIndex(distributionLaw);
         distributionLawB.addActionListener(this);
-
+        constraintsFields.gridwidth = GridBagConstraints.REMAINDER;
         pnlTransitionInfo.add(distributionLawB, constraintsFields );
+
+
         extraDelay1L = new JLabel("Attr 1:", SwingConstants.RIGHT);
         pnlTransitionInfo.add(extraDelay1L, constraintsLabels );
         extraDelay1T = new JTextField(extraDelay1, 10);
-        constraintsFields.gridwidth = GridBagConstraints.REMAINDER;;
+        constraintsFields.gridwidth = GridBagConstraints.REMAINDER;
         constraintsFields.insets.right = 0;
         pnlTransitionInfo.add(extraDelay1T, constraintsFields );
+
+        extraDelay2L = new JLabel("Attr 2:", SwingConstants.RIGHT);
+        pnlTransitionInfo.add(extraDelay2L, constraintsLabels );
+        extraDelay2T = new JTextField(extraDelay2, 10);
+        constraintsFields.gridwidth = GridBagConstraints.REMAINDER;;
+        constraintsFields.insets.right = 0;
+        pnlTransitionInfo.add(extraDelay2T, constraintsFields );
+
         checkAttributesDistributionLawB();
 
 
@@ -773,6 +786,8 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
 
     public String getExtraDelay1() { return extraDelay1T.getText();}
 
+    public String getExtraDelay2() { return extraDelay2T.getText();}
+
     public int getDistributionLaw() { return distributionLawB.getSelectedIndex();}
 
 //    public String getComputeMin() {
@@ -825,7 +840,18 @@ public class JDialogAvatarTransition extends JDialogBase implements ActionListen
         distributionLaw = distributionLawB.getSelectedIndex();
         int nbOfExtras = AvatarTransition.NB_OF_EXTRA_ATTRIBUTES[distributionLaw];
         extraDelay1T.setEnabled(nbOfExtras>0);
-        extraDelay1L.setText(AvatarTransition.LABELS_OF_EXTRA_ATTRIBUTES[distributionLaw] + ":");
+        if (extraDelay1T.isEnabled()) {
+            extraDelay1L.setText(AvatarTransition.LABELS_OF_EXTRA_ATTRIBUTES_1[distributionLaw] + ":");
+        } else {
+            extraDelay1L.setText("");
+        }
+        extraDelay2T.setEnabled(nbOfExtras>1);
+        if (extraDelay2T.isEnabled()) {
+            extraDelay2L.setText(AvatarTransition.LABELS_OF_EXTRA_ATTRIBUTES_2[distributionLaw] + ":");
+        } else {
+            extraDelay2L.setText("");
+        }
+
     }
 
 }
diff --git a/src/main/resources/ui/util/starting_logo.png b/src/main/resources/ui/util/starting_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..45bce4de750fe88a734d5ba888f628999658f925
Binary files /dev/null and b/src/main/resources/ui/util/starting_logo.png differ
diff --git a/src/main/resources/ui/util/starting_logo.xcf b/src/main/resources/ui/util/starting_logo.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..d063c73d8d1c47bc41e5a94fc7b8d330d3431be7
Binary files /dev/null and b/src/main/resources/ui/util/starting_logo.xcf differ
diff --git a/src/main/resources/ui/util/telecomparis_endossem_ipp_rvb_150pix.png b/src/main/resources/ui/util/telecomparis_endossem_ipp_rvb_150pix.png
new file mode 100644
index 0000000000000000000000000000000000000000..5508ad301722d4a1f0f359d1811e4ea7c0071752
Binary files /dev/null and b/src/main/resources/ui/util/telecomparis_endossem_ipp_rvb_150pix.png differ
diff --git a/tiftranslator/build.gradle b/tiftranslator/build.gradle
index a212cd3b73cfad7ada103dee89ca9af009deaeab..f48e23f81d4b4637b748cf51db7d1ac281d76d89 100644
--- a/tiftranslator/build.gradle
+++ b/tiftranslator/build.gradle
@@ -21,6 +21,7 @@ dependencies {
     compileOnly name: 'jsoup-1.8.1'
     compileOnly name: 'commons-codec-1.10'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/tiftranslator/manifest.txt b/tiftranslator/manifest.txt
index 0a03918307405fd4075e92a47d50409e1c9d047c..888e7d8d69791fab23a367ad56b08944c90afa09 100755
--- a/tiftranslator/manifest.txt
+++ b/tiftranslator/manifest.txt
@@ -1 +1,2 @@
 Main-Class: TIFTranslator
+Class-Path: ./commons-math3-3.6.1.jar
diff --git a/ttool-cli/src/main/java/TToolCLI.java b/ttool-cli/src/main/java/TToolCLI.java
index 3e3db912ba835340c6b3f202def19e17ad8b8ea7..31d93bc819e84ccba04bb2d26b493f07ba34d091 100755
--- a/ttool-cli/src/main/java/TToolCLI.java
+++ b/ttool-cli/src/main/java/TToolCLI.java
@@ -67,7 +67,7 @@ public class TToolCLI implements InterpreterOutputInterface {
 
     public static void printUsage() {
         System.out.println("ttool-cli: usage");
-        System.out.println("ttool-cli <script file> OR ttool-cli -help");
+        System.out.println("ttool-cli <script file> OR ttool-cli -help OR ttool-cli -interact");
         System.out.println("options: -debug -show");
 
     }
diff --git a/ttool/src/main/java/Main.java b/ttool/src/main/java/Main.java
index 2ed838b323daf72af7725aa125f6244cd6862797..a99b3332ec8772f576c14042bc30168bec3600c9 100755
--- a/ttool/src/main/java/Main.java
+++ b/ttool/src/main/java/Main.java
@@ -106,7 +106,7 @@ public class Main implements ActionListener, InterpreterOutputInterface{
 
         JStartingWindow splashFrame = null;
         //System.out.println("hello");
-        URL imageURL = Main.class.getResource("ui/util/starting_logo.gif");
+        URL imageURL = Main.class.getResource("ui/util/starting_logo.png");
         Image img;
         //System.out.println("helli");
         if (imageURL != null) {
diff --git a/ttool/src/test/java/cli/CLIModelTest.java b/ttool/src/test/java/cli/CLIModelTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..21a546622a8e28d121cdbe206e2a1d1c34d2e23d
--- /dev/null
+++ b/ttool/src/test/java/cli/CLIModelTest.java
@@ -0,0 +1,176 @@
+/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
+ *
+ * ludovic.apvrille AT enst.fr
+ *
+ * This software is a computer program whose purpose is to allow the
+ * edition of TURTLE analysis, design and deployment diagrams, to
+ * allow the generation of RT-LOTOS or Java code from this diagram,
+ * and at last to allow the analysis of formal validation traces
+ * obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
+ * from INRIA Rhone-Alpes.
+ *
+ * This software is governed by the CeCILL  license under French law and
+ * abiding by the rules of distribution of free software.  You can  use,
+ * modify and/ or redistribute the software under the terms of the CeCILL
+ * license as circulated by CEA, CNRS and INRIA at the following URL
+ * "http://www.cecill.info".
+ *
+ * As a counterpart to the access to the source code and  rights to copy,
+ * modify and redistribute granted by the license, users are provided only
+ * with a limited warranty  and the software's author,  the holder of the
+ * economic rights,  and the successive licensors  have only  limited
+ * liability.
+ *
+ * In this respect, the user's attention is drawn to the risks associated
+ * with loading,  using,  modifying and/or developing or reproducing the
+ * software by the user in light of its specific status of free software,
+ * that may mean  that it is complicated to manipulate,  and  that  also
+ * therefore means  that it is reserved for developers  and  experienced
+ * professionals having in-depth computer knowledge. Users are therefore
+ * encouraged to load and test the software's suitability as regards their
+ * requirements in conditions enabling the security of their systems and/or
+ * data to be ensured and,  more generally, to use and operate it in the
+ * same conditions as regards security.
+ *
+ * The fact that you are presently reading this means that you have had
+ * knowledge of the CeCILL license and that you accept its terms.
+ *
+ * /**
+ * Class AvatarPragma
+ * Creation: 20/05/2010
+ * @version 1.1 01/07/2014
+ * @author Ludovic APVRILLE, Raja GATGOUT
+ * @see
+ */
+
+package cli;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.nio.file.Files;
+
+import common.ConfigurationTTool;
+import common.SpecConfigTTool;
+import graph.AUTGraph;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import test.AbstractTest;
+
+
+public class CLIModelTest extends AbstractTest implements InterpreterOutputInterface {
+
+    final static String PATH_TO_TEST_FILE = "cli/input/";
+    final static String PATH_TO_OUTPUT_FILE = "cli/output/";
+    final static String NEW_MODEL_FILE = PATH_TO_OUTPUT_FILE + "mynewmodel.xml";
+    final static String EMPTY_MODEL_FILE = PATH_TO_OUTPUT_FILE + "myemptymodel.xml";
+    private StringBuilder outputResult;
+
+
+
+	public CLIModelTest() {
+	    //
+    }
+	
+
+    public void exit(int reason) {
+	    System.out.println("Exit reason=" + reason);
+	    assertTrue(reason == 1);
+    }
+
+    public void printError(String error) {
+        System.out.println("Error=" + error);
+    }
+
+    public void print(String s) {
+	    System.out.println("info from interpreter:" + s);
+	    outputResult.append(s);
+    }
+	
+	@Test
+	public void testNewModel() {
+	    String filePath = getBaseResourcesDir() + PATH_TO_TEST_FILE + "scriptmodel";
+	    String script;
+	    
+	    outputResult = new StringBuilder();
+
+	    File f = new File(filePath);
+	    assertTrue(myutil.FileUtils.checkFileForOpen(f));
+
+	    script = myutil.FileUtils.loadFileData(f);
+
+	    assertTrue(script.length() > 0);
+
+
+        // Create directory
+        File removeIfExists = new File(getBaseResourcesDir() + NEW_MODEL_FILE);
+        if (removeIfExists.exists()) {
+            removeIfExists.delete();
+        }
+        File makeDir = new File(getBaseResourcesDir() + PATH_TO_OUTPUT_FILE);
+        makeDir.mkdir();
+        System.out.println("Created: " + makeDir.getAbsolutePath());
+
+
+	    boolean show = false;
+        Interpreter interpret = new Interpreter(script, (InterpreterOutputInterface)this, show);
+        interpret.interpret();
+
+        // Must check if the model has really been saved
+        f = new File(getBaseResourcesDir() + NEW_MODEL_FILE);
+        assertTrue(myutil.FileUtils.checkFileForOpen(f));
+        String data = myutil.FileUtils.loadFileData(f);
+
+        assertTrue(data.length() > 0);
+        assertTrue (f.length() > 100);
+        assertTrue (f.length() < 500);
+
+
+
+
+	}
+
+    @Test
+    public void testRemoveTabEmptyModel() {
+        String filePath = getBaseResourcesDir() + PATH_TO_TEST_FILE + "scriptemptymodel";
+        String script;
+
+        outputResult = new StringBuilder();
+
+        File f = new File(filePath);
+        assertTrue(myutil.FileUtils.checkFileForOpen(f));
+
+        script = myutil.FileUtils.loadFileData(f);
+        assertTrue(script.length() > 0);
+
+        // Create directory
+        File removeIfExists = new File(getBaseResourcesDir() + EMPTY_MODEL_FILE);
+        if (removeIfExists.exists()) {
+            removeIfExists.delete();
+        }
+        File makeDir = new File(getBaseResourcesDir() + PATH_TO_OUTPUT_FILE);
+        makeDir.mkdir();
+        System.out.println("Created: " + makeDir.getAbsolutePath());
+
+
+        boolean show = false;
+        Interpreter interpret = new Interpreter(script, (InterpreterOutputInterface)this, show);
+        interpret.interpret();
+
+        // Must check if the model has really been saved
+        f = new File(getBaseResourcesDir() + EMPTY_MODEL_FILE);
+        assertTrue(myutil.FileUtils.checkFileForOpen(f));
+        String data = myutil.FileUtils.loadFileData(f);
+
+        assertTrue(data.length() > 0);
+        assertTrue (f.length() > 100);
+        assertTrue (f.length() < 500);
+
+
+
+
+    }
+	
+
+
+}
diff --git a/ttool/src/test/resources/cli/input/scriptemptymodel b/ttool/src/test/resources/cli/input/scriptemptymodel
new file mode 100644
index 0000000000000000000000000000000000000000..9e7d0b2afea0357bddd42d8c51b82900508e1e7a
--- /dev/null
+++ b/ttool/src/test/resources/cli/input/scriptemptymodel
@@ -0,0 +1,19 @@
+action start
+wait 2
+action new
+wait 2
+action set-file resources/test/cli/output/myemptymodel
+action get-file myfile
+print v myfile
+action save
+wait 1
+#We create a tab
+action new-design
+wait 1
+#We remove the tab
+action remove-current-tab
+wait 1
+#We save again the model
+action save
+wait 1
+action quit
diff --git a/ttool/src/test/resources/cli/input/scriptmodel b/ttool/src/test/resources/cli/input/scriptmodel
new file mode 100644
index 0000000000000000000000000000000000000000..6fa916b1976f1e0fcc71e094fa0bc65300bc8d9d
--- /dev/null
+++ b/ttool/src/test/resources/cli/input/scriptmodel
@@ -0,0 +1,10 @@
+action start
+wait 2
+action new
+wait 2
+action set-file resources/test/cli/output/mynewmodel
+action get-file myfile
+print v myfile
+action save
+wait 1
+action quit
diff --git a/webcrawler/client/build.gradle b/webcrawler/client/build.gradle
index 32b37c99eefeb308be7fc95dd41f7ac0beb0d378..a1f6d212056988d0b47d54c7fbfa4a1a22c8e808 100644
--- a/webcrawler/client/build.gradle
+++ b/webcrawler/client/build.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'application'
+	apply plugin: 'application'
 
 // This defines the source sets for this subproject
 sourceSets {
@@ -23,6 +23,7 @@ dependencies {
     compileOnly name: 'jaxen-1.1.6'
     compileOnly name: 'opencloud'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/webcrawler/client/manifest.txt b/webcrawler/client/manifest.txt
index 6388a4abfbc1e1f93859ec540a48817b56d7e5fd..1523723e6cd3d5b4e8165ccd458b0cc349cd8346 100644
--- a/webcrawler/client/manifest.txt
+++ b/webcrawler/client/manifest.txt
@@ -1 +1,2 @@
 Main-Class: web.crawler.Client
+Class-Path: ./commons-math3-3.6.1.jar
diff --git a/webcrawler/server/build.gradle b/webcrawler/server/build.gradle
index 9fd7dc9b7bff90b1a2ccc6ac2826c5f9effbb686..8f96dac04b6f4df56b85fffb889d5af9291ffe9e 100644
--- a/webcrawler/server/build.gradle
+++ b/webcrawler/server/build.gradle
@@ -23,6 +23,7 @@ dependencies {
     compile name: 'jaxen-1.1.6'
     compile name: 'opencloud'
     compileOnly name: 'jna-3.3.0'
+    compile name: 'commons-math3-3.6.1'
 }
 
 jar {
diff --git a/webcrawler/server/manifest.txt b/webcrawler/server/manifest.txt
index 0dda684c2bd9ec1f614c896b411cf06bcb414026..448510555248c46bf1185c5849750470487f9f35 100644
--- a/webcrawler/server/manifest.txt
+++ b/webcrawler/server/manifest.txt
@@ -1,2 +1,2 @@
 Main-Class: web.crawler.Server
-Class-Path: ./commons-io-2.5.jar ./commons-io-2.5-javadoc.jar ./derbyclient-10.9.1.0.jar ./derbynet.jar ./dom4j-1.6.1.jar ./derby.jar ./JavaPlot.jar ./jaxen-1.1.6.jar ./opencloud.jar
+Class-Path: ./commons-io-2.5.jar ./commons-io-2.5-javadoc.jar ./derbyclient-10.9.1.0.jar ./derbynet.jar ./dom4j-1.6.1.jar ./derby.jar ./JavaPlot.jar ./jaxen-1.1.6.jar ./opencloud.jar ./commons-math3-3.6.1.jar