diff --git a/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml b/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
index 118e5fd7939323975780c95fc78bc0d886187d00..169622d8562a4c0a992bc824ff1a86b7708c4b1a 100644
--- a/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
+++ b/modeling/AVATAR/MicroWaveOven_SafetySecurity_testCodeGeneration.xml
@@ -1057,7 +1057,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="632" />
-<P1  x="120" y="239" id="666" />
+<P1  x="120" y="239" id="679" />
 <P2  x="191" y="187" id="648" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1066,7 +1066,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="634" />
-<P1  x="118" y="191" id="679" />
+<P1  x="118" y="191" id="666" />
 <P2  x="191" y="167" id="646" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1156,11 +1156,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="676" >
 <father id="714" num="0" />
-<cdparam x="20" y="219" />
+<cdparam x="18" y="171" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="closed" />
+<infoparam name="TGComponent" value="open" />
 <TGConnectingPoint num="0" id="664" />
 <TGConnectingPoint num="1" id="665" />
 <TGConnectingPoint num="2" id="666" />
@@ -1176,11 +1176,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="689" >
 <father id="714" num="1" />
-<cdparam x="18" y="171" />
+<cdparam x="20" y="219" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="open" />
+<infoparam name="TGComponent" value="closed" />
 <TGConnectingPoint num="0" id="677" />
 <TGConnectingPoint num="1" id="678" />
 <TGConnectingPoint num="2" id="679" />
@@ -1265,7 +1265,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="755" />
-<P1  x="141" y="80" id="798" />
+<P1  x="141" y="80" id="811" />
 <P2  x="179" y="60" id="768" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1274,7 +1274,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="757" />
-<P1  x="141" y="146" id="806" />
+<P1  x="141" y="146" id="793" />
 <P2  x="175" y="146" id="780" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1376,13 +1376,13 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="22" id="839" />
 <TGConnectingPoint num="23" id="840" />
 </COMPONENT>
-<SUBCOMPONENT type="5303" id="803" >
+<SUBCOMPONENT type="5304" id="803" >
 <father id="841" num="0" />
-<cdparam x="41" y="68" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="41" y="126" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="14" minY="0" maxY="116" />
-<infoparam name="TGComponent" value="remainingTime" />
+<cdrectangleparam minX="0" maxX="14" minY="0" maxY="126" />
+<infoparam name="TGComponent" value="ringBell" />
 <TGConnectingPoint num="0" id="791" />
 <TGConnectingPoint num="1" id="792" />
 <TGConnectingPoint num="2" id="793" />
@@ -1395,17 +1395,14 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="9" id="800" />
 <TGConnectingPoint num="10" id="801" />
 <TGConnectingPoint num="11" id="802" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="816" >
+<SUBCOMPONENT type="5303" id="816" >
 <father id="841" num="1" />
-<cdparam x="41" y="126" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="41" y="68" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="14" minY="0" maxY="126" />
-<infoparam name="TGComponent" value="ringBell" />
+<cdrectangleparam minX="0" maxX="14" minY="0" maxY="116" />
+<infoparam name="TGComponent" value="remainingTime" />
 <TGConnectingPoint num="0" id="804" />
 <TGConnectingPoint num="1" id="805" />
 <TGConnectingPoint num="2" id="806" />
@@ -1418,6 +1415,9 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="9" id="813" />
 <TGConnectingPoint num="10" id="814" />
 <TGConnectingPoint num="11" id="815" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
 </SUBCOMPONENT>
 
 
@@ -1447,7 +1447,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="846" />
-<P1  x="119" y="400" id="1021" />
+<P1  x="119" y="400" id="1008" />
 <P2  x="175" y="370" id="939" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1456,7 +1456,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="848" />
-<P1  x="121" y="353" id="1008" />
+<P1  x="121" y="353" id="1021" />
 <P2  x="175" y="350" id="937" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1465,7 +1465,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="850" />
-<P1  x="120" y="248" id="957" />
+<P1  x="120" y="248" id="970" />
 <P2  x="189" y="226" id="916" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1474,7 +1474,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="852" />
-<P1  x="122" y="198" id="970" />
+<P1  x="122" y="198" id="957" />
 <P2  x="189" y="216" id="915" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -1678,11 +1678,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="967" >
 <father id="1005" num="0" />
-<cdparam x="20" y="228" />
+<cdparam x="22" y="178" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="closed" />
+<infoparam name="TGComponent" value="open" />
 <TGConnectingPoint num="0" id="955" />
 <TGConnectingPoint num="1" id="956" />
 <TGConnectingPoint num="2" id="957" />
@@ -1698,11 +1698,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="980" >
 <father id="1005" num="1" />
-<cdparam x="22" y="178" />
+<cdparam x="20" y="228" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="101" />
-<infoparam name="TGComponent" value="open" />
+<infoparam name="TGComponent" value="closed" />
 <TGConnectingPoint num="0" id="968" />
 <TGConnectingPoint num="1" id="969" />
 <TGConnectingPoint num="2" id="970" />
@@ -1750,11 +1750,11 @@ A sensor attached to the door enables detection of
 </COMPONENT>
 <SUBCOMPONENT type="5304" id="1018" >
 <father id="1056" num="0" />
-<cdparam x="21" y="333" />
+<cdparam x="19" y="380" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="99" />
-<infoparam name="TGComponent" value="startCooking" />
+<infoparam name="TGComponent" value="stopCooking" />
 <TGConnectingPoint num="0" id="1006" />
 <TGConnectingPoint num="1" id="1007" />
 <TGConnectingPoint num="2" id="1008" />
@@ -1770,11 +1770,11 @@ A sensor attached to the door enables detection of
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5304" id="1031" >
 <father id="1056" num="1" />
-<cdparam x="19" y="380" />
+<cdparam x="21" y="333" />
 <sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="24" minY="0" maxY="99" />
-<infoparam name="TGComponent" value="stopCooking" />
+<infoparam name="TGComponent" value="startCooking" />
 <TGConnectingPoint num="0" id="1019" />
 <TGConnectingPoint num="1" id="1020" />
 <TGConnectingPoint num="2" id="1021" />
@@ -2040,7 +2040,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="1" id="1160" />
 <TGConnectingPoint num="2" id="1161" />
 <P1  x="746" y="209" id="1300" />
-<P2  x="864" y="242" id="1596" />
+<P2  x="864" y="242" id="1671" />
 <Point x="832" y="209" />
 <Point x="832" y="241" />
 <AutomaticDrawing  data="true" />
@@ -2068,7 +2068,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="1165" />
 <TGConnectingPoint num="1" id="1166" />
 <TGConnectingPoint num="2" id="1167" />
-<P1  x="836" y="301" id="1621" />
+<P1  x="836" y="301" id="1646" />
 <P2  x="746" y="229" id="1302" />
 <Point x="802" y="301" />
 <Point x="802" y="229" />
@@ -2098,7 +2098,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="1" id="1173" />
 <TGConnectingPoint num="2" id="1174" />
 <TGConnectingPoint num="3" id="1175" />
-<P1  x="543" y="549" id="1372" />
+<P1  x="543" y="549" id="1472" />
 <P2  x="652" y="239" id="1303" />
 <Point x="609" y="549" />
 <Point x="609" y="283" />
@@ -2143,7 +2143,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1179" />
-<P1  x="390" y="342" id="1847" />
+<P1  x="390" y="342" id="1797" />
 <P2  x="651" y="342" id="1268" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2154,7 +2154,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="1182" />
 <TGConnectingPoint num="1" id="1183" />
 <P1  x="492" y="225" id="1254" />
-<P2  x="271" y="189" id="1797" />
+<P2  x="271" y="189" id="1847" />
 <Point x="492" y="189" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1181" >
@@ -2171,7 +2171,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1185" />
-<P1  x="279" y="245" id="1872" />
+<P1  x="279" y="245" id="1772" />
 <P2  x="430" y="245" id="1255" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2180,7 +2180,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1187" />
-<P1  x="492" y="479" id="1345" />
+<P1  x="492" y="479" id="1495" />
 <P2  x="492" y="265" id="1257" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2191,7 +2191,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="1191" />
 <TGConnectingPoint num="1" id="1192" />
 <TGConnectingPoint num="2" id="1193" />
-<P1  x="271" y="145" id="1779" />
+<P1  x="271" y="145" id="1879" />
 <P2  x="621" y="209" id="1299" />
 <Point x="505" y="145" />
 <Point x="505" y="209" />
@@ -2219,7 +2219,7 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1195" />
 <P1  x="569" y="124" id="1286" />
-<P2  x="271" y="125" id="1777" />
+<P2  x="271" y="125" id="1877" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="133" id="1198" >
@@ -2227,7 +2227,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1197" />
-<P1  x="787" y="123" id="1546" />
+<P1  x="787" y="123" id="1721" />
 <P2  x="694" y="124" id="1287" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2238,7 +2238,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="1201" />
 <TGConnectingPoint num="1" id="1202" />
 <TGConnectingPoint num="2" id="1203" />
-<P1  x="834" y="183" id="1571" />
+<P1  x="834" y="183" id="1696" />
 <P2  x="694" y="144" id="1289" />
 <Point x="753" y="183" />
 <Point x="753" y="144" />
@@ -2323,8 +2323,8 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1218" />
 <TGConnectingPoint num="1" id="1219" />
-<P1  x="499" y="703" id="1447" />
-<P2  x="906" y="498" id="1698" />
+<P1  x="499" y="703" id="1397" />
+<P2  x="906" y="498" id="1573" />
 <Point x="906" y="703" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1217" >
@@ -2343,7 +2343,7 @@ A sensor attached to the door enables detection of
 <TGConnectingPoint num="0" id="1222" />
 <TGConnectingPoint num="1" id="1223" />
 <P1  x="1253" y="400" id="1319" />
-<P2  x="1141" y="368" id="1647" />
+<P2  x="1141" y="368" id="1622" />
 <Point x="1253" y="367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1221" >
@@ -2360,7 +2360,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1225" />
-<P1  x="1040" y="420" id="1672" />
+<P1  x="1040" y="420" id="1597" />
 <P2  x="1191" y="420" id="1320" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2370,7 +2370,7 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1228" />
 <TGConnectingPoint num="1" id="1229" />
-<P1  x="1120" y="480" id="1722" />
+<P1  x="1120" y="480" id="1547" />
 <P2  x="1253" y="440" id="1322" />
 <Point x="1253" y="480" />
 <AutomaticDrawing  data="true" />
@@ -2388,7 +2388,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1231" />
-<P1  x="487" y="811" id="1495" />
+<P1  x="487" y="811" id="1345" />
 <P2  x="427" y="787" id="1343" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2397,7 +2397,7 @@ A sensor attached to the door enables detection of
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1233" />
-<P1  x="338" y="807" id="1470" />
+<P1  x="338" y="807" id="1370" />
 <P2  x="365" y="787" id="1342" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2407,7 +2407,7 @@ A sensor attached to the door enables detection of
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="1235" />
 <P1  x="396" y="747" id="1332" />
-<P2  x="396" y="723" id="1448" />
+<P2  x="396" y="723" id="1398" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="301" id="1253" >
@@ -2636,12 +2636,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="1369" >
 <father id="1544" num="0" />
-<cdparam x="423" y="479" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="437" y="811" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="189" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="CorruptOrFakeMessage" />
+<cdrectangleparam minX="0" maxX="228" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="BusProbing" />
 <TGConnectingPoint num="0" id="1345" />
 <TGConnectingPoint num="1" id="1346" />
 <TGConnectingPoint num="2" id="1347" />
@@ -2672,12 +2672,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1394" >
 <father id="1544" num="1" />
-<cdparam x="269" y="529" />
-<sizeparam width="274" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="256" y="807" />
+<sizeparam width="165" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="54" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="AttackerInjectWrongFirmwareOnTheDomainBus" />
+<cdrectangleparam minX="0" maxX="163" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="HijackingTheRemoteSession" />
 <TGConnectingPoint num="0" id="1370" />
 <TGConnectingPoint num="1" id="1371" />
 <TGConnectingPoint num="2" id="1372" />
@@ -2708,12 +2708,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1419" >
 <father id="1544" num="2" />
-<cdparam x="310" y="633" />
-<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="293" y="683" />
+<sizeparam width="206" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="193" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="ManInTheMiddleAttack" />
+<cdrectangleparam minX="0" maxX="122" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="RemoteControlProtocolVulnerability" />
 <TGConnectingPoint num="0" id="1395" />
 <TGConnectingPoint num="1" id="1396" />
 <TGConnectingPoint num="2" id="1397" />
@@ -2739,7 +2739,7 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1417" />
 <TGConnectingPoint num="23" id="1418" />
 <extraparam>
-<info description="" root="false" />
+<info description="Exploit vulnerability or implementation error" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1444" >
@@ -2780,12 +2780,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1469" >
 <father id="1544" num="4" />
-<cdparam x="293" y="683" />
-<sizeparam width="206" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="310" y="633" />
+<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="122" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="RemoteControlProtocolVulnerability" />
+<cdrectangleparam minX="0" maxX="193" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="ManInTheMiddleAttack" />
 <TGConnectingPoint num="0" id="1445" />
 <TGConnectingPoint num="1" id="1446" />
 <TGConnectingPoint num="2" id="1447" />
@@ -2811,17 +2811,17 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1467" />
 <TGConnectingPoint num="23" id="1468" />
 <extraparam>
-<info description="Exploit vulnerability or implementation error" root="false" />
+<info description="" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1494" >
 <father id="1544" num="5" />
-<cdparam x="256" y="807" />
-<sizeparam width="165" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="269" y="529" />
+<sizeparam width="274" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="163" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="HijackingTheRemoteSession" />
+<cdrectangleparam minX="0" maxX="54" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="AttackerInjectWrongFirmwareOnTheDomainBus" />
 <TGConnectingPoint num="0" id="1470" />
 <TGConnectingPoint num="1" id="1471" />
 <TGConnectingPoint num="2" id="1472" />
@@ -2852,12 +2852,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1519" >
 <father id="1544" num="6" />
-<cdparam x="437" y="811" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="423" y="479" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="228" minY="0" maxY="389" />
-<infoparam name="TGComponent" value="BusProbing" />
+<cdrectangleparam minX="0" maxX="189" minY="0" maxY="389" />
+<infoparam name="TGComponent" value="CorruptOrFakeMessage" />
 <TGConnectingPoint num="0" id="1495" />
 <TGConnectingPoint num="1" id="1496" />
 <TGConnectingPoint num="2" id="1497" />
@@ -2920,12 +2920,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="1569" >
 <father id="1769" num="0" />
-<cdparam x="787" y="103" />
-<sizeparam width="360" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="985" y="460" />
+<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InfectedControllerSendsTooManyMessagesToWirelessInterface" />
+<cdrectangleparam minX="0" maxX="241" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InjectBogusKeysInOven" />
 <TGConnectingPoint num="0" id="1545" />
 <TGConnectingPoint num="1" id="1546" />
 <TGConnectingPoint num="2" id="1547" />
@@ -2956,12 +2956,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1594" >
 <father id="1769" num="1" />
-<cdparam x="834" y="163" />
-<sizeparam width="253" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="838" y="458" />
+<sizeparam width="137" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="123" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="ExploitVulnerabilitesOrImplementationError" />
+<cdrectangleparam minX="0" maxX="239" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="FlashYourOwnFirmware" />
 <TGConnectingPoint num="0" id="1570" />
 <TGConnectingPoint num="1" id="1571" />
 <TGConnectingPoint num="2" id="1572" />
@@ -2992,12 +2992,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1619" >
 <father id="1769" num="2" />
-<cdparam x="864" y="222" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="836" y="400" />
+<sizeparam width="204" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="237" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="AbortFlashingOperation" />
+<cdrectangleparam minX="0" maxX="172" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="FaultyORNoFirmwareAuthentication" />
 <TGConnectingPoint num="0" id="1595" />
 <TGConnectingPoint num="1" id="1596" />
 <TGConnectingPoint num="2" id="1597" />
@@ -3028,12 +3028,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1644" >
 <father id="1769" num="3" />
-<cdparam x="836" y="281" />
-<sizeparam width="235" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="802" y="348" />
+<sizeparam width="339" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="141" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InfectedWirelessInterfaceNotResponding" />
+<cdrectangleparam minX="0" maxX="37" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="MaintenanceInstalledModifiedFirmwareToWirelessInterface" />
 <TGConnectingPoint num="0" id="1620" />
 <TGConnectingPoint num="1" id="1621" />
 <TGConnectingPoint num="2" id="1622" />
@@ -3059,17 +3059,17 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1642" />
 <TGConnectingPoint num="23" id="1643" />
 <extraparam>
-<info description="Denial of service" root="false" />
+<info description="" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1669" >
 <father id="1769" num="4" />
-<cdparam x="802" y="348" />
-<sizeparam width="339" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="836" y="281" />
+<sizeparam width="235" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="37" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="MaintenanceInstalledModifiedFirmwareToWirelessInterface" />
+<cdrectangleparam minX="0" maxX="141" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InfectedWirelessInterfaceNotResponding" />
 <TGConnectingPoint num="0" id="1645" />
 <TGConnectingPoint num="1" id="1646" />
 <TGConnectingPoint num="2" id="1647" />
@@ -3095,17 +3095,17 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1667" />
 <TGConnectingPoint num="23" id="1668" />
 <extraparam>
-<info description="" root="false" />
+<info description="Denial of service" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1694" >
 <father id="1769" num="5" />
-<cdparam x="836" y="400" />
-<sizeparam width="204" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="864" y="222" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="172" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="FaultyORNoFirmwareAuthentication" />
+<cdrectangleparam minX="0" maxX="237" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="AbortFlashingOperation" />
 <TGConnectingPoint num="0" id="1670" />
 <TGConnectingPoint num="1" id="1671" />
 <TGConnectingPoint num="2" id="1672" />
@@ -3136,12 +3136,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1719" >
 <father id="1769" num="6" />
-<cdparam x="838" y="458" />
-<sizeparam width="137" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="834" y="163" />
+<sizeparam width="253" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="239" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="FlashYourOwnFirmware" />
+<cdrectangleparam minX="0" maxX="123" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="ExploitVulnerabilitesOrImplementationError" />
 <TGConnectingPoint num="0" id="1695" />
 <TGConnectingPoint num="1" id="1696" />
 <TGConnectingPoint num="2" id="1697" />
@@ -3172,12 +3172,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1744" >
 <father id="1769" num="7" />
-<cdparam x="985" y="460" />
-<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="787" y="103" />
+<sizeparam width="360" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="241" minY="0" maxY="425" />
-<infoparam name="TGComponent" value="InjectBogusKeysInOven" />
+<cdrectangleparam minX="0" maxX="16" minY="0" maxY="425" />
+<infoparam name="TGComponent" value="InfectedControllerSendsTooManyMessagesToWirelessInterface" />
 <TGConnectingPoint num="0" id="1720" />
 <TGConnectingPoint num="1" id="1721" />
 <TGConnectingPoint num="2" id="1722" />
@@ -3240,12 +3240,12 @@ or by a maintenance station
 </COMPONENT>
 <SUBCOMPONENT type="1401" id="1794" >
 <father id="1919" num="0" />
-<cdparam x="88" y="115" />
-<sizeparam width="183" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="99" y="225" />
+<sizeparam width="180" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="171" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="OvenTakesTooLongToRespond" />
+<cdrectangleparam minX="0" maxX="174" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="ExploitVulnerabilitiesInFlashing" />
 <TGConnectingPoint num="0" id="1770" />
 <TGConnectingPoint num="1" id="1771" />
 <TGConnectingPoint num="2" id="1772" />
@@ -3271,17 +3271,17 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1792" />
 <TGConnectingPoint num="23" id="1793" />
 <extraparam>
-<info description="Denial of Service Attack" root="false" />
+<info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1819" >
 <father id="1919" num="1" />
-<cdparam x="90" y="169" />
-<sizeparam width="181" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="78" y="322" />
+<sizeparam width="312" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="173" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="GainAccessToWirelessInterface" />
+<cdrectangleparam minX="0" maxX="42" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="InfectedWirelessInterfaceShuttingDownCommunication" />
 <TGConnectingPoint num="0" id="1795" />
 <TGConnectingPoint num="1" id="1796" />
 <TGConnectingPoint num="2" id="1797" />
@@ -3348,12 +3348,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1869" >
 <father id="1919" num="3" />
-<cdparam x="78" y="322" />
-<sizeparam width="312" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="90" y="169" />
+<sizeparam width="181" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="42" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="InfectedWirelessInterfaceShuttingDownCommunication" />
+<cdrectangleparam minX="0" maxX="173" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="GainAccessToWirelessInterface" />
 <TGConnectingPoint num="0" id="1845" />
 <TGConnectingPoint num="1" id="1846" />
 <TGConnectingPoint num="2" id="1847" />
@@ -3384,12 +3384,12 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1401" id="1894" >
 <father id="1919" num="4" />
-<cdparam x="99" y="225" />
-<sizeparam width="180" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="88" y="115" />
+<sizeparam width="183" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="174" minY="0" maxY="273" />
-<infoparam name="TGComponent" value="ExploitVulnerabilitiesInFlashing" />
+<cdrectangleparam minX="0" maxX="171" minY="0" maxY="273" />
+<infoparam name="TGComponent" value="OvenTakesTooLongToRespond" />
 <TGConnectingPoint num="0" id="1870" />
 <TGConnectingPoint num="1" id="1871" />
 <TGConnectingPoint num="2" id="1872" />
@@ -3415,7 +3415,7 @@ or by a maintenance station
 <TGConnectingPoint num="22" id="1892" />
 <TGConnectingPoint num="23" id="1893" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="Denial of Service Attack" root="false" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4619,8 +4619,8 @@ or by a maintenance station
 <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="2460" />
-<P1  x="468" y="658" id="2546" />
-<P2  x="173" y="657" id="2696" />
+<P1  x="468" y="658" id="2696" />
+<P2  x="173" y="657" id="2721" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -4668,7 +4668,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2468" />
 <P1  x="476" y="912" id="2623" />
-<P2  x="377" y="911" id="2665" />
+<P2  x="377" y="911" id="2565" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -4681,7 +4681,7 @@ or by a maintenance station
 <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="2470" />
-<P1  x="850" y="926" id="2573" />
+<P1  x="850" y="926" id="2673" />
 <P2  x="804" y="912" id="2624" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -4698,7 +4698,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="2472" />
 <P1  x="804" y="787" id="2613" />
-<P2  x="835" y="698" id="2589" />
+<P2  x="835" y="698" id="2639" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -4713,7 +4713,7 @@ or by a maintenance station
 <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="2474" />
-<P1  x="443" y="757" id="2640" />
+<P1  x="443" y="757" id="2590" />
 <P2  x="476" y="870" id="2614" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -4874,50 +4874,13 @@ or by a maintenance station
 <Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="2710" >
-<father id="2760" num="0" />
-<cdparam x="173" y="554" />
-<sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
-<infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="2686" />
-<TGConnectingPoint num="1" id="2687" />
-<TGConnectingPoint num="2" id="2688" />
-<TGConnectingPoint num="3" id="2689" />
-<TGConnectingPoint num="4" id="2690" />
-<TGConnectingPoint num="5" id="2691" />
-<TGConnectingPoint num="6" id="2692" />
-<TGConnectingPoint num="7" id="2693" />
-<TGConnectingPoint num="8" id="2694" />
-<TGConnectingPoint num="9" id="2695" />
-<TGConnectingPoint num="10" id="2696" />
-<TGConnectingPoint num="11" id="2697" />
-<TGConnectingPoint num="12" id="2698" />
-<TGConnectingPoint num="13" id="2699" />
-<TGConnectingPoint num="14" id="2700" />
-<TGConnectingPoint num="15" id="2701" />
-<TGConnectingPoint num="16" id="2702" />
-<TGConnectingPoint num="17" id="2703" />
-<TGConnectingPoint num="18" id="2704" />
-<TGConnectingPoint num="19" id="2705" />
-<TGConnectingPoint num="20" id="2706" />
-<TGConnectingPoint num="21" id="2707" />
-<TGConnectingPoint num="22" id="2708" />
-<TGConnectingPoint num="23" id="2709" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" attached="false" />
-</extraparam>
-</SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2560" >
-<father id="2710" num="0" />
-<cdparam x="468" y="620" />
-<sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2760" num="0" />
+<cdparam x="491" y="390" />
+<sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
-<infoparam name="Block0" value="WirelessInterface" />
+<cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
+<infoparam name="Block0" value="RemoteControl" />
 <TGConnectingPoint num="0" id="2536" />
 <TGConnectingPoint num="1" id="2537" />
 <TGConnectingPoint num="2" id="2538" />
@@ -4945,9 +4908,9 @@ or by a maintenance station
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -4970,16 +4933,54 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<Signal value="out remoteStart(int value)" attached="false" />
+<globalCode value="" />
+<globalCode value="/* This is my global code !!!! */" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="2735" >
+<father id="2760" num="1" />
+<cdparam x="173" y="554" />
+<sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
+<infoparam name="Block0" value="MicroWaveOven" />
+<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" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2585" >
-<father id="2710" num="1" />
-<cdparam x="850" y="832" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2735" num="0" />
+<cdparam x="196" y="864" />
+<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
-<infoparam name="Block0" value="Door" />
+<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
+<infoparam name="Block0" value="Bell" />
 <TGConnectingPoint num="0" id="2561" />
 <TGConnectingPoint num="1" id="2562" />
 <TGConnectingPoint num="2" id="2563" />
@@ -5007,32 +5008,24 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$openM()" />
-<Method value="$closeM()" />
-<Signal value="out closed()" attached="false" />
-<Signal value="out open()" attached="false" />
-<globalCode value="" />
+<Method value="$runBell()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* openD = &quot;Open Door&quot;;" />
-<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Door__openM() {" />
-<globalCode value="  sendDatagram(openD, 10);" />
-<globalCode value="}" />
+<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Door__closeM() {" />
-<globalCode value="   sendDatagram(closeD, 10);" />
+<globalCode value="void _userImplemented_Bell__runBell() {" />
+<globalCode value="  sendDatagram(dring, 18);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2610" >
-<father id="2710" num="2" />
-<cdparam x="835" y="618" />
-<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2735" num="1" />
+<cdparam x="187" y="676" />
+<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
-<infoparam name="Block0" value="Magnetron" />
+<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
+<infoparam name="Block0" value="ControlPanel" />
 <TGConnectingPoint num="0" id="2586" />
 <TGConnectingPoint num="1" id="2587" />
 <TGConnectingPoint num="2" id="2588" />
@@ -5049,36 +5042,25 @@ or by a maintenance station
 <TGConnectingPoint num="13" id="2599" />
 <TGConnectingPoint num="14" id="2600" />
 <TGConnectingPoint num="15" id="2601" />
-<TGConnectingPoint num="16" id="2602" />
-<TGConnectingPoint num="17" id="2603" />
-<TGConnectingPoint num="18" id="2604" />
-<TGConnectingPoint num="19" id="2605" />
-<TGConnectingPoint num="20" id="2606" />
-<TGConnectingPoint num="21" id="2607" />
-<TGConnectingPoint num="22" id="2608" />
-<TGConnectingPoint num="23" id="2609" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Method value="$ON()" />
-<Method value="$OFF()" />
-<Signal value="in startM()" attached="false" />
-<Signal value="in stopM()" attached="false" />
-<globalCode value="extern void sendDatagram(char *data, int size);" />
-<globalCode value="" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__ON() {" />
-<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
-<globalCode value="}" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__OFF() {" />
-<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
-<globalCode value="}" />
+<TGConnectingPoint num="16" id="2602" />
+<TGConnectingPoint num="17" id="2603" />
+<TGConnectingPoint num="18" id="2604" />
+<TGConnectingPoint num="19" id="2605" />
+<TGConnectingPoint num="20" id="2606" />
+<TGConnectingPoint num="21" id="2607" />
+<TGConnectingPoint num="22" id="2608" />
+<TGConnectingPoint num="23" id="2609" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2635" >
-<father id="2710" num="3" />
+<father id="2735" num="2" />
 <cdparam x="476" y="787" />
 <sizeparam width="328" height="167" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -5157,12 +5139,12 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2660" >
-<father id="2710" num="4" />
-<cdparam x="187" y="676" />
-<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2735" num="3" />
+<cdparam x="835" y="618" />
+<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
-<infoparam name="Block0" value="ControlPanel" />
+<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
+<infoparam name="Block0" value="Magnetron" />
 <TGConnectingPoint num="0" id="2636" />
 <TGConnectingPoint num="1" id="2637" />
 <TGConnectingPoint num="2" id="2638" />
@@ -5190,19 +5172,30 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" attached="false" />
-<Signal value="in LEDoff()" attached="false" />
-<Signal value="out startButton(int duration)" attached="false" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Method value="$ON()" />
+<Method value="$OFF()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
+<globalCode value="extern void sendDatagram(char *data, int size);" />
+<globalCode value="" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__ON() {" />
+<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__OFF() {" />
+<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
+<globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="2685" >
-<father id="2710" num="5" />
-<cdparam x="196" y="864" />
-<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="2735" num="4" />
+<cdparam x="850" y="832" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
-<infoparam name="Block0" value="Bell" />
+<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
+<infoparam name="Block0" value="Door" />
 <TGConnectingPoint num="0" id="2661" />
 <TGConnectingPoint num="1" id="2662" />
 <TGConnectingPoint num="2" id="2663" />
@@ -5230,54 +5223,62 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$runBell()" />
-<Signal value="in ring()" attached="false" />
+<Method value="$openM()" />
+<Method value="$closeM()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
+<globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
+<globalCode value="const char* openD = &quot;Open Door&quot;;" />
+<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Bell__runBell() {" />
-<globalCode value="  sendDatagram(dring, 18);" />
+<globalCode value="void _userImplemented_Door__openM() {" />
+<globalCode value="  sendDatagram(openD, 10);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Door__closeM() {" />
+<globalCode value="   sendDatagram(closeD, 10);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2735" >
-<father id="2760" num="1" />
-<cdparam x="491" y="390" />
-<sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="2710" >
+<father id="2735" num="5" />
+<cdparam x="468" y="620" />
+<sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
-<infoparam name="Block0" value="RemoteControl" />
-<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" />
+<cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
+<infoparam name="Block0" value="WirelessInterface" />
+<TGConnectingPoint num="0" id="2686" />
+<TGConnectingPoint num="1" id="2687" />
+<TGConnectingPoint num="2" id="2688" />
+<TGConnectingPoint num="3" id="2689" />
+<TGConnectingPoint num="4" id="2690" />
+<TGConnectingPoint num="5" id="2691" />
+<TGConnectingPoint num="6" id="2692" />
+<TGConnectingPoint num="7" id="2693" />
+<TGConnectingPoint num="8" id="2694" />
+<TGConnectingPoint num="9" id="2695" />
+<TGConnectingPoint num="10" id="2696" />
+<TGConnectingPoint num="11" id="2697" />
+<TGConnectingPoint num="12" id="2698" />
+<TGConnectingPoint num="13" id="2699" />
+<TGConnectingPoint num="14" id="2700" />
+<TGConnectingPoint num="15" id="2701" />
+<TGConnectingPoint num="16" id="2702" />
+<TGConnectingPoint num="17" id="2703" />
+<TGConnectingPoint num="18" id="2704" />
+<TGConnectingPoint num="19" id="2705" />
+<TGConnectingPoint num="20" id="2706" />
+<TGConnectingPoint num="21" id="2707" />
+<TGConnectingPoint num="22" id="2708" />
+<TGConnectingPoint num="23" id="2709" />
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -5300,8 +5301,7 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<globalCode value="" />
-<globalCode value="/* This is my global code !!!! */" />
+<Signal value="out remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -10102,8 +10102,8 @@ or by a maintenance station
 <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="5018" />
-<P1  x="350" y="536" id="5252" />
-<P2  x="322" y="493" id="5277" />
+<P1  x="350" y="536" id="5102" />
+<P2  x="322" y="493" id="5252" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -10151,7 +10151,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="5026" />
 <P1  x="316" y="678" id="5181" />
-<P2  x="296" y="680" id="5123" />
+<P2  x="296" y="680" id="5223" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -10164,7 +10164,7 @@ or by a maintenance station
 <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="5028" />
-<P1  x="672" y="696" id="5231" />
+<P1  x="672" y="696" id="5131" />
 <P2  x="644" y="678" id="5182" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -10181,7 +10181,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="5030" />
 <P1  x="644" y="616" id="5180" />
-<P2  x="671" y="592" id="5197" />
+<P2  x="671" y="592" id="5147" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -10196,7 +10196,7 @@ or by a maintenance station
 <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="5032" />
-<P1  x="294" y="601" id="5148" />
+<P1  x="294" y="601" id="5198" />
 <P2  x="316" y="647" id="5172" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -10357,13 +10357,50 @@ or by a maintenance station
 <Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="5118" >
+<SUBCOMPONENT type="5000" id="5268" >
 <father id="5318" num="0" />
-<cdparam x="381" y="389" />
-<sizeparam width="414" height="96" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="163" y="493" />
+<sizeparam width="637" height="230" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="244" minY="0" maxY="286" />
-<infoparam name="Block0" value="RemoteControl" />
+<cdrectangleparam minX="0" maxX="21" minY="0" maxY="152" />
+<infoparam name="Block0" value="MicroWaveOven" />
+<TGConnectingPoint num="0" id="5244" />
+<TGConnectingPoint num="1" id="5245" />
+<TGConnectingPoint num="2" id="5246" />
+<TGConnectingPoint num="3" id="5247" />
+<TGConnectingPoint num="4" id="5248" />
+<TGConnectingPoint num="5" id="5249" />
+<TGConnectingPoint num="6" id="5250" />
+<TGConnectingPoint num="7" id="5251" />
+<TGConnectingPoint num="8" id="5252" />
+<TGConnectingPoint num="9" id="5253" />
+<TGConnectingPoint num="10" id="5254" />
+<TGConnectingPoint num="11" id="5255" />
+<TGConnectingPoint num="12" id="5256" />
+<TGConnectingPoint num="13" id="5257" />
+<TGConnectingPoint num="14" id="5258" />
+<TGConnectingPoint num="15" id="5259" />
+<TGConnectingPoint num="16" id="5260" />
+<TGConnectingPoint num="17" id="5261" />
+<TGConnectingPoint num="18" id="5262" />
+<TGConnectingPoint num="19" id="5263" />
+<TGConnectingPoint num="20" id="5264" />
+<TGConnectingPoint num="21" id="5265" />
+<TGConnectingPoint num="22" id="5266" />
+<TGConnectingPoint num="23" id="5267" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in remoteStart(int value)" attached="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="5118" >
+<father id="5268" num="0" />
+<cdparam x="314" y="536" />
+<sizeparam width="146" height="45" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="491" minY="0" maxY="185" />
+<infoparam name="Block0" value="WirelessInterface" />
 <TGConnectingPoint num="0" id="5094" />
 <TGConnectingPoint num="1" id="5095" />
 <TGConnectingPoint num="2" id="5096" />
@@ -10391,9 +10428,9 @@ or by a maintenance station
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -10416,54 +10453,16 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<globalCode value="" />
-<globalCode value="/* This is my global code !!!! */" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="5293" >
-<father id="5318" num="1" />
-<cdparam x="163" y="493" />
-<sizeparam width="637" height="230" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="21" minY="0" maxY="152" />
-<infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="5269" />
-<TGConnectingPoint num="1" id="5270" />
-<TGConnectingPoint num="2" id="5271" />
-<TGConnectingPoint num="3" id="5272" />
-<TGConnectingPoint num="4" id="5273" />
-<TGConnectingPoint num="5" id="5274" />
-<TGConnectingPoint num="6" id="5275" />
-<TGConnectingPoint num="7" id="5276" />
-<TGConnectingPoint num="8" id="5277" />
-<TGConnectingPoint num="9" id="5278" />
-<TGConnectingPoint num="10" id="5279" />
-<TGConnectingPoint num="11" id="5280" />
-<TGConnectingPoint num="12" id="5281" />
-<TGConnectingPoint num="13" id="5282" />
-<TGConnectingPoint num="14" id="5283" />
-<TGConnectingPoint num="15" id="5284" />
-<TGConnectingPoint num="16" id="5285" />
-<TGConnectingPoint num="17" id="5286" />
-<TGConnectingPoint num="18" id="5287" />
-<TGConnectingPoint num="19" id="5288" />
-<TGConnectingPoint num="20" id="5289" />
-<TGConnectingPoint num="21" id="5290" />
-<TGConnectingPoint num="22" id="5291" />
-<TGConnectingPoint num="23" id="5292" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" attached="false" />
+<Signal value="out remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="5143" >
-<father id="5293" num="0" />
-<cdparam x="169" y="653" />
-<sizeparam width="127" height="54" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="5268" num="1" />
+<cdparam x="672" y="654" />
+<sizeparam width="118" height="56" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="510" minY="0" maxY="176" />
-<infoparam name="Block0" value="Bell" />
+<cdrectangleparam minX="0" maxX="519" minY="0" maxY="174" />
+<infoparam name="Block0" value="Door" />
 <TGConnectingPoint num="0" id="5119" />
 <TGConnectingPoint num="1" id="5120" />
 <TGConnectingPoint num="2" id="5121" />
@@ -10491,24 +10490,32 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$runBell()" />
-<Signal value="in ring()" attached="false" />
+<Method value="$openM()" />
+<Method value="$closeM()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
+<globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
+<globalCode value="const char* openD = &quot;Open Door&quot;;" />
+<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Bell__runBell() {" />
-<globalCode value="  sendDatagram(dring, 18);" />
+<globalCode value="void _userImplemented_Door__openM() {" />
+<globalCode value="  sendDatagram(openD, 10);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Door__closeM() {" />
+<globalCode value="   sendDatagram(closeD, 10);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="5168" >
-<father id="5293" num="1" />
-<cdparam x="170" y="555" />
-<sizeparam width="124" height="92" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="5268" num="2" />
+<cdparam x="671" y="536" />
+<sizeparam width="117" height="112" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="513" minY="0" maxY="138" />
-<infoparam name="Block0" value="ControlPanel" />
+<cdrectangleparam minX="0" maxX="520" minY="0" maxY="118" />
+<infoparam name="Block0" value="Magnetron" />
 <TGConnectingPoint num="0" id="5144" />
 <TGConnectingPoint num="1" id="5145" />
 <TGConnectingPoint num="2" id="5146" />
@@ -10536,14 +10543,25 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" attached="false" />
-<Signal value="in LEDoff()" attached="false" />
-<Signal value="out startButton(int duration)" attached="false" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Method value="$ON()" />
+<Method value="$OFF()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
+<globalCode value="extern void sendDatagram(char *data, int size);" />
+<globalCode value="" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__ON() {" />
+<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__OFF() {" />
+<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
+<globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="5193" >
-<father id="5293" num="2" />
+<father id="5268" num="3" />
 <cdparam x="316" y="585" />
 <sizeparam width="328" height="125" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -10622,12 +10640,12 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="5218" >
-<father id="5293" num="3" />
-<cdparam x="671" y="536" />
-<sizeparam width="117" height="112" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="5268" num="4" />
+<cdparam x="170" y="555" />
+<sizeparam width="124" height="92" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="520" minY="0" maxY="118" />
-<infoparam name="Block0" value="Magnetron" />
+<cdrectangleparam minX="0" maxX="513" minY="0" maxY="138" />
+<infoparam name="Block0" value="ControlPanel" />
 <TGConnectingPoint num="0" id="5194" />
 <TGConnectingPoint num="1" id="5195" />
 <TGConnectingPoint num="2" id="5196" />
@@ -10655,30 +10673,19 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Method value="$ON()" />
-<Method value="$OFF()" />
-<Signal value="in startM()" attached="false" />
-<Signal value="in stopM()" attached="false" />
-<globalCode value="extern void sendDatagram(char *data, int size);" />
-<globalCode value="" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__ON() {" />
-<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
-<globalCode value="}" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__OFF() {" />
-<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
-<globalCode value="}" />
+<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="5243" >
-<father id="5293" num="4" />
-<cdparam x="672" y="654" />
-<sizeparam width="118" height="56" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="5268" num="5" />
+<cdparam x="169" y="653" />
+<sizeparam width="127" height="54" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="519" minY="0" maxY="174" />
-<infoparam name="Block0" value="Door" />
+<cdrectangleparam minX="0" maxX="510" minY="0" maxY="176" />
+<infoparam name="Block0" value="Bell" />
 <TGConnectingPoint num="0" id="5219" />
 <TGConnectingPoint num="1" id="5220" />
 <TGConnectingPoint num="2" id="5221" />
@@ -10706,62 +10713,54 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$openM()" />
-<Method value="$closeM()" />
-<Signal value="out closed()" attached="false" />
-<Signal value="out open()" attached="false" />
-<globalCode value="" />
+<Method value="$runBell()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* openD = &quot;Open Door&quot;;" />
-<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Door__openM() {" />
-<globalCode value="  sendDatagram(openD, 10);" />
-<globalCode value="}" />
+<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Door__closeM() {" />
-<globalCode value="   sendDatagram(closeD, 10);" />
+<globalCode value="void _userImplemented_Bell__runBell() {" />
+<globalCode value="  sendDatagram(dring, 18);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="5268" >
-<father id="5293" num="5" />
-<cdparam x="314" y="536" />
-<sizeparam width="146" height="45" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="5293" >
+<father id="5318" num="1" />
+<cdparam x="381" y="389" />
+<sizeparam width="414" height="96" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="491" minY="0" maxY="185" />
-<infoparam name="Block0" value="WirelessInterface" />
-<TGConnectingPoint num="0" id="5244" />
-<TGConnectingPoint num="1" id="5245" />
-<TGConnectingPoint num="2" id="5246" />
-<TGConnectingPoint num="3" id="5247" />
-<TGConnectingPoint num="4" id="5248" />
-<TGConnectingPoint num="5" id="5249" />
-<TGConnectingPoint num="6" id="5250" />
-<TGConnectingPoint num="7" id="5251" />
-<TGConnectingPoint num="8" id="5252" />
-<TGConnectingPoint num="9" id="5253" />
-<TGConnectingPoint num="10" id="5254" />
-<TGConnectingPoint num="11" id="5255" />
-<TGConnectingPoint num="12" id="5256" />
-<TGConnectingPoint num="13" id="5257" />
-<TGConnectingPoint num="14" id="5258" />
-<TGConnectingPoint num="15" id="5259" />
-<TGConnectingPoint num="16" id="5260" />
-<TGConnectingPoint num="17" id="5261" />
-<TGConnectingPoint num="18" id="5262" />
-<TGConnectingPoint num="19" id="5263" />
-<TGConnectingPoint num="20" id="5264" />
-<TGConnectingPoint num="21" id="5265" />
-<TGConnectingPoint num="22" id="5266" />
-<TGConnectingPoint num="23" id="5267" />
+<cdrectangleparam minX="0" maxX="244" minY="0" maxY="286" />
+<infoparam name="Block0" value="RemoteControl" />
+<TGConnectingPoint num="0" id="5269" />
+<TGConnectingPoint num="1" id="5270" />
+<TGConnectingPoint num="2" id="5271" />
+<TGConnectingPoint num="3" id="5272" />
+<TGConnectingPoint num="4" id="5273" />
+<TGConnectingPoint num="5" id="5274" />
+<TGConnectingPoint num="6" id="5275" />
+<TGConnectingPoint num="7" id="5276" />
+<TGConnectingPoint num="8" id="5277" />
+<TGConnectingPoint num="9" id="5278" />
+<TGConnectingPoint num="10" id="5279" />
+<TGConnectingPoint num="11" id="5280" />
+<TGConnectingPoint num="12" id="5281" />
+<TGConnectingPoint num="13" id="5282" />
+<TGConnectingPoint num="14" id="5283" />
+<TGConnectingPoint num="15" id="5284" />
+<TGConnectingPoint num="16" id="5285" />
+<TGConnectingPoint num="17" id="5286" />
+<TGConnectingPoint num="18" id="5287" />
+<TGConnectingPoint num="19" id="5288" />
+<TGConnectingPoint num="20" id="5289" />
+<TGConnectingPoint num="21" id="5290" />
+<TGConnectingPoint num="22" id="5291" />
+<TGConnectingPoint num="23" id="5292" />
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -10784,7 +10783,8 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<Signal value="out remoteStart(int value)" attached="false" />
+<globalCode value="" />
+<globalCode value="/* This is my global code !!!! */" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -15533,8 +15533,8 @@ or by a maintenance station
 <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="7558" />
-<P1  x="468" y="658" id="7794" />
-<P2  x="173" y="657" id="7819" />
+<P1  x="468" y="658" id="7644" />
+<P2  x="173" y="657" id="7794" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in remoteStart(int value)" />
@@ -15582,7 +15582,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="7566" />
 <P1  x="476" y="912" id="7721" />
-<P2  x="377" y="911" id="7663" />
+<P2  x="377" y="911" id="7763" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -15595,7 +15595,7 @@ or by a maintenance station
 <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="7568" />
-<P1  x="850" y="926" id="7771" />
+<P1  x="850" y="926" id="7671" />
 <P2  x="804" y="912" id="7722" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -15614,7 +15614,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="7570" />
 <P1  x="804" y="787" id="7711" />
-<P2  x="835" y="698" id="7737" />
+<P2  x="835" y="698" id="7687" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -15629,7 +15629,7 @@ or by a maintenance station
 <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="7572" />
-<P1  x="443" y="757" id="7688" />
+<P1  x="443" y="757" id="7738" />
 <P2  x="476" y="870" id="7712" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -15790,13 +15790,50 @@ or by a maintenance station
 <Signal value="out wirelessChannelWrite(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="7658" >
+<SUBCOMPONENT type="5000" id="7808" >
 <father id="7858" num="0" />
-<cdparam x="491" y="390" />
-<sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="173" y="554" />
+<sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
-<infoparam name="Block0" value="RemoteControl" />
+<cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
+<infoparam name="Block0" value="MicroWaveOven" />
+<TGConnectingPoint num="0" id="7784" />
+<TGConnectingPoint num="1" id="7785" />
+<TGConnectingPoint num="2" id="7786" />
+<TGConnectingPoint num="3" id="7787" />
+<TGConnectingPoint num="4" id="7788" />
+<TGConnectingPoint num="5" id="7789" />
+<TGConnectingPoint num="6" id="7790" />
+<TGConnectingPoint num="7" id="7791" />
+<TGConnectingPoint num="8" id="7792" />
+<TGConnectingPoint num="9" id="7793" />
+<TGConnectingPoint num="10" id="7794" />
+<TGConnectingPoint num="11" id="7795" />
+<TGConnectingPoint num="12" id="7796" />
+<TGConnectingPoint num="13" id="7797" />
+<TGConnectingPoint num="14" id="7798" />
+<TGConnectingPoint num="15" id="7799" />
+<TGConnectingPoint num="16" id="7800" />
+<TGConnectingPoint num="17" id="7801" />
+<TGConnectingPoint num="18" id="7802" />
+<TGConnectingPoint num="19" id="7803" />
+<TGConnectingPoint num="20" id="7804" />
+<TGConnectingPoint num="21" id="7805" />
+<TGConnectingPoint num="22" id="7806" />
+<TGConnectingPoint num="23" id="7807" />
+<extraparam>
+<blockType data="block" color="-4072719" />
+<CryptoBlock value="false" />
+<Signal value="in remoteStart(int value)" attached="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="7658" >
+<father id="7808" num="0" />
+<cdparam x="468" y="620" />
+<sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
+<infoparam name="Block0" value="WirelessInterface" />
 <TGConnectingPoint num="0" id="7634" />
 <TGConnectingPoint num="1" id="7635" />
 <TGConnectingPoint num="2" id="7636" />
@@ -15824,9 +15861,9 @@ or by a maintenance station
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
-<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -15849,54 +15886,16 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<globalCode value="" />
-<globalCode value="/* This is my global code !!!! */" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="7833" >
-<father id="7858" num="1" />
-<cdparam x="173" y="554" />
-<sizeparam width="921" height="412" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="46" minY="0" maxY="219" />
-<infoparam name="Block0" value="MicroWaveOven" />
-<TGConnectingPoint num="0" id="7809" />
-<TGConnectingPoint num="1" id="7810" />
-<TGConnectingPoint num="2" id="7811" />
-<TGConnectingPoint num="3" id="7812" />
-<TGConnectingPoint num="4" id="7813" />
-<TGConnectingPoint num="5" id="7814" />
-<TGConnectingPoint num="6" id="7815" />
-<TGConnectingPoint num="7" id="7816" />
-<TGConnectingPoint num="8" id="7817" />
-<TGConnectingPoint num="9" id="7818" />
-<TGConnectingPoint num="10" id="7819" />
-<TGConnectingPoint num="11" id="7820" />
-<TGConnectingPoint num="12" id="7821" />
-<TGConnectingPoint num="13" id="7822" />
-<TGConnectingPoint num="14" id="7823" />
-<TGConnectingPoint num="15" id="7824" />
-<TGConnectingPoint num="16" id="7825" />
-<TGConnectingPoint num="17" id="7826" />
-<TGConnectingPoint num="18" id="7827" />
-<TGConnectingPoint num="19" id="7828" />
-<TGConnectingPoint num="20" id="7829" />
-<TGConnectingPoint num="21" id="7830" />
-<TGConnectingPoint num="22" id="7831" />
-<TGConnectingPoint num="23" id="7832" />
-<extraparam>
-<blockType data="block" color="-4072719" />
-<CryptoBlock value="false" />
-<Signal value="in remoteStart(int value)" attached="false" />
+<Signal value="out remoteStart(int value)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="7683" >
-<father id="7833" num="0" />
-<cdparam x="196" y="864" />
-<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="7808" num="1" />
+<cdparam x="850" y="832" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
-<infoparam name="Block0" value="Bell" />
+<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
+<infoparam name="Block0" value="Door" />
 <TGConnectingPoint num="0" id="7659" />
 <TGConnectingPoint num="1" id="7660" />
 <TGConnectingPoint num="2" id="7661" />
@@ -15924,24 +15923,33 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$runBell()" />
-<Signal value="in ring()" attached="false" />
+<Method value="$openM()" />
+<Method value="$closeM()" />
+<Signal value="out closed()" attached="false" />
+<Signal value="out open()" attached="false" />
+<Signal value="in unlockDoor()" attached="false" />
+<globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
+<globalCode value="const char* openD = &quot;Open Door&quot;;" />
+<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Bell__runBell() {" />
-<globalCode value="  sendDatagram(dring, 18);" />
+<globalCode value="void _userImplemented_Door__openM() {" />
+<globalCode value="  sendDatagram(openD, 10);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Door__closeM() {" />
+<globalCode value="   sendDatagram(closeD, 10);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="7708" >
-<father id="7833" num="1" />
-<cdparam x="187" y="676" />
-<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="7808" num="2" />
+<cdparam x="835" y="618" />
+<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
-<infoparam name="Block0" value="ControlPanel" />
+<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
+<infoparam name="Block0" value="Magnetron" />
 <TGConnectingPoint num="0" id="7684" />
 <TGConnectingPoint num="1" id="7685" />
 <TGConnectingPoint num="2" id="7686" />
@@ -15969,14 +15977,25 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" attached="false" />
-<Signal value="in LEDoff()" attached="false" />
-<Signal value="out startButton(int duration)" attached="false" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Method value="$ON()" />
+<Method value="$OFF()" />
+<Signal value="in startM()" attached="false" />
+<Signal value="in stopM()" attached="false" />
+<globalCode value="extern void sendDatagram(char *data, int size);" />
+<globalCode value="" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__ON() {" />
+<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void _userImplemented_Magnetron__OFF() {" />
+<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
+<globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="7733" >
-<father id="7833" num="2" />
+<father id="7808" num="3" />
 <cdparam x="476" y="787" />
 <sizeparam width="328" height="167" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -16056,12 +16075,12 @@ or by a maintenance station
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="7758" >
-<father id="7833" num="3" />
-<cdparam x="835" y="618" />
-<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="7808" num="4" />
+<cdparam x="187" y="676" />
+<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
-<infoparam name="Block0" value="Magnetron" />
+<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
+<infoparam name="Block0" value="ControlPanel" />
 <TGConnectingPoint num="0" id="7734" />
 <TGConnectingPoint num="1" id="7735" />
 <TGConnectingPoint num="2" id="7736" />
@@ -16089,30 +16108,19 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Method value="$ON()" />
-<Method value="$OFF()" />
-<Signal value="in startM()" attached="false" />
-<Signal value="in stopM()" attached="false" />
-<globalCode value="extern void sendDatagram(char *data, int size);" />
-<globalCode value="" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__ON() {" />
-<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
-<globalCode value="}" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Magnetron__OFF() {" />
-<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
-<globalCode value="}" />
+<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="false" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="7783" >
-<father id="7833" num="4" />
-<cdparam x="850" y="832" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="7808" num="5" />
+<cdparam x="196" y="864" />
+<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
-<infoparam name="Block0" value="Door" />
+<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
+<infoparam name="Block0" value="Bell" />
 <TGConnectingPoint num="0" id="7759" />
 <TGConnectingPoint num="1" id="7760" />
 <TGConnectingPoint num="2" id="7761" />
@@ -16140,63 +16148,54 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$openM()" />
-<Method value="$closeM()" />
-<Signal value="out closed()" attached="false" />
-<Signal value="out open()" attached="false" />
-<Signal value="in unlockDoor()" attached="false" />
-<globalCode value="" />
+<Method value="$runBell()" />
+<Signal value="in ring()" attached="false" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* openD = &quot;Open Door&quot;;" />
-<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
-<globalCode value="" />
-<globalCode value="void _userImplemented_Door__openM() {" />
-<globalCode value="  sendDatagram(openD, 10);" />
-<globalCode value="}" />
+<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
 <globalCode value="" />
-<globalCode value="void _userImplemented_Door__closeM() {" />
-<globalCode value="   sendDatagram(closeD, 10);" />
+<globalCode value="void _userImplemented_Bell__runBell() {" />
+<globalCode value="  sendDatagram(dring, 18);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="7808" >
-<father id="7833" num="5" />
-<cdparam x="468" y="620" />
-<sizeparam width="334" height="154" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="7833" >
+<father id="7858" num="1" />
+<cdparam x="491" y="390" />
+<sizeparam width="414" height="148" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="587" minY="0" maxY="258" />
-<infoparam name="Block0" value="WirelessInterface" />
-<TGConnectingPoint num="0" id="7784" />
-<TGConnectingPoint num="1" id="7785" />
-<TGConnectingPoint num="2" id="7786" />
-<TGConnectingPoint num="3" id="7787" />
-<TGConnectingPoint num="4" id="7788" />
-<TGConnectingPoint num="5" id="7789" />
-<TGConnectingPoint num="6" id="7790" />
-<TGConnectingPoint num="7" id="7791" />
-<TGConnectingPoint num="8" id="7792" />
-<TGConnectingPoint num="9" id="7793" />
-<TGConnectingPoint num="10" id="7794" />
-<TGConnectingPoint num="11" id="7795" />
-<TGConnectingPoint num="12" id="7796" />
-<TGConnectingPoint num="13" id="7797" />
-<TGConnectingPoint num="14" id="7798" />
-<TGConnectingPoint num="15" id="7799" />
-<TGConnectingPoint num="16" id="7800" />
-<TGConnectingPoint num="17" id="7801" />
-<TGConnectingPoint num="18" id="7802" />
-<TGConnectingPoint num="19" id="7803" />
-<TGConnectingPoint num="20" id="7804" />
-<TGConnectingPoint num="21" id="7805" />
-<TGConnectingPoint num="22" id="7806" />
-<TGConnectingPoint num="23" id="7807" />
+<cdrectangleparam minX="0" maxX="553" minY="0" maxY="483" />
+<infoparam name="Block0" value="RemoteControl" />
+<TGConnectingPoint num="0" id="7809" />
+<TGConnectingPoint num="1" id="7810" />
+<TGConnectingPoint num="2" id="7811" />
+<TGConnectingPoint num="3" id="7812" />
+<TGConnectingPoint num="4" id="7813" />
+<TGConnectingPoint num="5" id="7814" />
+<TGConnectingPoint num="6" id="7815" />
+<TGConnectingPoint num="7" id="7816" />
+<TGConnectingPoint num="8" id="7817" />
+<TGConnectingPoint num="9" id="7818" />
+<TGConnectingPoint num="10" id="7819" />
+<TGConnectingPoint num="11" id="7820" />
+<TGConnectingPoint num="12" id="7821" />
+<TGConnectingPoint num="13" id="7822" />
+<TGConnectingPoint num="14" id="7823" />
+<TGConnectingPoint num="15" id="7824" />
+<TGConnectingPoint num="16" id="7825" />
+<TGConnectingPoint num="17" id="7826" />
+<TGConnectingPoint num="18" id="7827" />
+<TGConnectingPoint num="19" id="7828" />
+<TGConnectingPoint num="20" id="7829" />
+<TGConnectingPoint num="21" id="7830" />
+<TGConnectingPoint num="22" id="7831" />
+<TGConnectingPoint num="23" id="7832" />
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
-<Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="duration" value="12" type="8" typeOther="" />
+<Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="PSK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="selectedDuration" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -16219,7 +16218,8 @@ or by a maintenance station
 <Method value="Key getpk(Message cert)" />
 <Method value="Key DH(Key pubK, Key privK)" />
 <Method value="Message hash(Message msg)" />
-<Signal value="out remoteStart(int value)" attached="false" />
+<globalCode value="" />
+<globalCode value="/* This is my global code !!!! */" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -21075,7 +21075,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="10134" />
 <P1  x="476" y="912" id="10229" />
-<P2  x="377" y="911" id="10271" />
+<P2  x="377" y="911" id="10171" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in ring()" />
@@ -21088,7 +21088,7 @@ or by a maintenance station
 <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="10136" />
-<P1  x="850" y="927" id="10179" />
+<P1  x="850" y="927" id="10279" />
 <P2  x="804" y="912" id="10230" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -21107,7 +21107,7 @@ or by a maintenance station
 <infoparam name="connector from Block0 to Block0" value="" />
 <TGConnectingPoint num="0" id="10138" />
 <P1  x="804" y="787" id="10219" />
-<P2  x="835" y="698" id="10195" />
+<P2  x="835" y="698" id="10245" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in startM()" />
@@ -21122,7 +21122,7 @@ or by a maintenance station
 <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="10140" />
-<P1  x="443" y="757" id="10246" />
+<P1  x="443" y="757" id="10196" />
 <P2  x="476" y="870" id="10220" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -21248,11 +21248,11 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="10191" >
 <father id="10316" num="0" />
-<cdparam x="850" y="833" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="196" y="864" />
+<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
-<infoparam name="Block0" value="Door" />
+<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
+<infoparam name="Block0" value="Bell" />
 <TGConnectingPoint num="0" id="10167" />
 <TGConnectingPoint num="1" id="10168" />
 <TGConnectingPoint num="2" id="10169" />
@@ -21280,33 +21280,24 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$openM()" />
-<Method value="$closeM()" />
-<Signal value="out closed()" attached="true" />
-<Signal value="out open()" attached="true" />
-<Signal value="in unlockDoor()" attached="true" />
-<globalCode value="" />
+<Method value="$runBell()" />
+<Signal value="in ring()" attached="true" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* openD = &quot;Open Door&quot;;" />
-<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
-<globalCode value="" />
-<globalCode value="void __userImplemented__Door__openM() {" />
-<globalCode value="  sendDatagram(openD, 10);" />
-<globalCode value="}" />
+<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
 <globalCode value="" />
-<globalCode value="void __userImplemented__Door__closeM() {" />
-<globalCode value="   sendDatagram(closeD, 10);" />
+<globalCode value="void __userImplemented__Bell__runBell() {" />
+<globalCode value="  sendDatagram(dring, 18);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="10216" >
 <father id="10316" num="1" />
-<cdparam x="835" y="618" />
-<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="187" y="676" />
+<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
-<infoparam name="Block0" value="Magnetron" />
+<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
+<infoparam name="Block0" value="ControlPanel" />
 <TGConnectingPoint num="0" id="10192" />
 <TGConnectingPoint num="1" id="10193" />
 <TGConnectingPoint num="2" id="10194" />
@@ -21334,21 +21325,10 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="power" value="0" type="8" typeOther="" />
-<Method value="$ON()" />
-<Method value="$OFF()" />
-<Signal value="in startM()" attached="true" />
-<Signal value="in stopM()" attached="true" />
-<globalCode value="extern void sendDatagram(char *data, int size);" />
-<globalCode value="" />
-<globalCode value="" />
-<globalCode value="void __userImplemented__Magnetron__ON() {" />
-<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
-<globalCode value="}" />
-<globalCode value="" />
-<globalCode value="void __userImplemented__Magnetron__OFF() {" />
-<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
-<globalCode value="}" />
+<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
+<Signal value="in LEDOn()" attached="false" />
+<Signal value="in LEDoff()" attached="false" />
+<Signal value="out startButton(int duration)" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="10241" >
@@ -21433,11 +21413,11 @@ or by a maintenance station
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="10266" >
 <father id="10316" num="3" />
-<cdparam x="187" y="676" />
-<sizeparam width="256" height="162" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="835" y="618" />
+<sizeparam width="253" height="160" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="665" minY="0" maxY="250" />
-<infoparam name="Block0" value="ControlPanel" />
+<cdrectangleparam minX="0" maxX="668" minY="0" maxY="252" />
+<infoparam name="Block0" value="Magnetron" />
 <TGConnectingPoint num="0" id="10242" />
 <TGConnectingPoint num="1" id="10243" />
 <TGConnectingPoint num="2" id="10244" />
@@ -21465,19 +21445,30 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Attribute access="0" id="duration" value="9" type="8" typeOther="" />
-<Signal value="in LEDOn()" attached="false" />
-<Signal value="in LEDoff()" attached="false" />
-<Signal value="out startButton(int duration)" attached="true" />
+<Attribute access="0" id="power" value="0" type="8" typeOther="" />
+<Method value="$ON()" />
+<Method value="$OFF()" />
+<Signal value="in startM()" attached="true" />
+<Signal value="in stopM()" attached="true" />
+<globalCode value="extern void sendDatagram(char *data, int size);" />
+<globalCode value="" />
+<globalCode value="" />
+<globalCode value="void __userImplemented__Magnetron__ON() {" />
+<globalCode value="  sendDatagram(&quot;Magnetron_ON&quot;, 13);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void __userImplemented__Magnetron__OFF() {" />
+<globalCode value="   sendDatagram(&quot;Magnetron_OFF&quot;, 14);" />
+<globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="10291" >
 <father id="10316" num="4" />
-<cdparam x="196" y="864" />
-<sizeparam width="181" height="95" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="850" y="833" />
+<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="740" minY="0" maxY="317" />
-<infoparam name="Block0" value="Bell" />
+<cdrectangleparam minX="0" maxX="706" minY="0" maxY="286" />
+<infoparam name="Block0" value="Door" />
 <TGConnectingPoint num="0" id="10267" />
 <TGConnectingPoint num="1" id="10268" />
 <TGConnectingPoint num="2" id="10269" />
@@ -21505,14 +21496,23 @@ or by a maintenance station
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
-<Method value="$runBell()" />
-<Signal value="in ring()" attached="true" />
+<Method value="$openM()" />
+<Method value="$closeM()" />
+<Signal value="out closed()" attached="true" />
+<Signal value="out open()" attached="true" />
+<Signal value="in unlockDoor()" attached="true" />
+<globalCode value="" />
 <globalCode value="extern void sendDatagram(char *data, int size);" />
 <globalCode value="" />
-<globalCode value="const char* dring = &quot;Dring dring dring&quot;;" />
+<globalCode value="const char* openD = &quot;Open Door&quot;;" />
+<globalCode value="const char* closeD = &quot;Close Door&quot;;" />
 <globalCode value="" />
-<globalCode value="void __userImplemented__Bell__runBell() {" />
-<globalCode value="  sendDatagram(dring, 18);" />
+<globalCode value="void __userImplemented__Door__openM() {" />
+<globalCode value="  sendDatagram(openD, 10);" />
+<globalCode value="}" />
+<globalCode value="" />
+<globalCode value="void __userImplemented__Door__closeM() {" />
+<globalCode value="   sendDatagram(closeD, 10);" />
 <globalCode value="}" />
 </extraparam>
 </SUBCOMPONENT>
diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index fee293ccb0ce2537a1091f1ab2d3764c6627e748..9c15244bb1907abb43a6b0ee04740b85d8ad742d 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -8,16 +8,16 @@
 <cdparam x="535" y="347" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="556" y="347" id="169" />
-<P2  x="547" y="382" id="216" />
+<P1  x="556" y="321" id="113" />
+<P2  x="534" y="395" id="68" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="3" >
 <cdparam x="820" y="398" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="1025" y="497" id="63" />
-<P2  x="761" y="574" id="184" />
+<P1  x="1025" y="471" id="210" />
+<P2  x="761" y="548" id="98" />
 <Point x="887" y="577" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2" >
@@ -33,192 +33,192 @@
 <cdparam x="568" y="323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="710" y="403" id="186" />
-<P2  x="693" y="347" id="147" />
+<P1  x="710" y="403" id="96" />
+<P2  x="693" y="321" id="135" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="5" >
 <cdparam x="522" y="390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="382" id="211" />
-<P2  x="466" y="335" id="41" />
+<P1  x="534" y="369" id="63" />
+<P2  x="453" y="322" id="33" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6" >
 <cdparam x="409" y="124" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="401" y="83" id="43" />
-<P2  x="593" y="84" id="171" />
+<P1  x="401" y="83" id="31" />
+<P2  x="593" y="84" id="111" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="7" >
 <cdparam x="656" y="426" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="552" id="190" />
-<P2  x="969" y="495" id="77" />
+<P1  x="805" y="542" id="92" />
+<P2  x="969" y="474" id="196" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="8" >
 <cdparam x="656" y="400" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="519" id="192" />
-<P2  x="921" y="476" id="75" />
+<P1  x="805" y="509" id="90" />
+<P2  x="931" y="466" id="198" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="9" >
 <cdparam x="602" y="327" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="751" y="406" id="200" />
-<P2  x="829" y="375" id="105" />
+<P1  x="751" y="406" id="82" />
+<P2  x="842" y="362" id="162" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="10" >
 <cdparam x="689" y="292" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="855" y="375" id="109" />
-<P2  x="921" y="362" id="85" />
+<P1  x="842" y="388" id="166" />
+<P2  x="931" y="352" id="188" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="11" >
 <cdparam x="656" y="377" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="491" id="196" />
-<P2  x="921" y="453" id="83" />
+<P1  x="805" y="481" id="86" />
+<P2  x="931" y="443" id="190" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="12" >
 <cdparam x="656" y="351" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="816" y="458" id="194" />
-<P2  x="921" y="426" id="81" />
+<P1  x="805" y="448" id="88" />
+<P2  x="931" y="416" id="192" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="13" >
 <cdparam x="741" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="921" y="397" id="79" />
-<P2  x="816" y="429" id="198" />
+<P1  x="931" y="387" id="194" />
+<P2  x="805" y="419" id="84" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="14" >
 <cdparam x="735" y="260" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="918" y="330" id="87" />
-<P2  x="747" y="282" id="159" />
+<P1  x="931" y="317" id="186" />
+<P2  x="734" y="269" id="123" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="15" >
 <cdparam x="641" y="230" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="747" y="248" id="157" />
-<P2  x="918" y="291" id="89" />
+<P1  x="734" y="235" id="125" />
+<P2  x="931" y="278" id="184" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="16" >
 <cdparam x="641" y="195" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="747" y="203" id="155" />
-<P2  x="918" y="248" id="91" />
+<P1  x="734" y="190" id="127" />
+<P2  x="931" y="235" id="182" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="17" >
 <cdparam x="740" y="353" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="829" y="375" id="104" />
-<P2  x="747" y="314" id="153" />
+<P1  x="842" y="362" id="161" />
+<P2  x="734" y="301" id="129" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="18" >
 <cdparam x="460" y="270" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="295" id="163" />
-<P2  x="466" y="299" id="35" />
+<P1  x="534" y="282" id="119" />
+<P2  x="453" y="286" id="39" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="19" >
 <cdparam x="387" y="129" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="464" y="126" id="31" />
-<P2  x="524" y="126" id="151" />
+<P1  x="453" y="116" id="43" />
+<P2  x="534" y="116" id="131" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="20" >
 <cdparam x="389" y="200" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="466" y="215" id="37" />
-<P2  x="521" y="215" id="165" />
+<P1  x="453" y="202" id="37" />
+<P2  x="534" y="202" id="117" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="21" >
 <cdparam x="460" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="521" y="260" id="167" />
-<P2  x="466" y="260" id="39" />
+<P1  x="534" y="247" id="115" />
+<P2  x="453" y="247" id="35" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="22" >
 <cdparam x="389" y="163" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="466" y="169" id="33" />
-<P2  x="521" y="169" id="161" />
+<P1  x="453" y="156" id="41" />
+<P2  x="534" y="156" id="121" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="23" >
 <cdparam x="967" y="190" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="918" y="198" id="93" />
-<P2  x="747" y="124" id="173" />
+<P1  x="931" y="185" id="180" />
+<P2  x="734" y="111" id="109" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="24" >
 <cdparam x="1028" y="535" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="630" y="345" id="149" />
-<P2  x="669" y="406" id="188" />
+<P1  x="630" y="324" id="133" />
+<P2  x="669" y="406" id="94" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="25" >
 <cdparam x="1308" y="303" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1222" y="378" id="127" />
-<P2  x="1178" y="380" id="73" />
+<P1  x="1232" y="368" id="146" />
+<P2  x="1167" y="370" id="200" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="26" >
 <cdparam x="1172" y="437" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="415" id="71" />
-<P2  x="1222" y="413" id="125" />
+<P1  x="1167" y="405" id="202" />
+<P2  x="1232" y="403" id="148" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="29" >
 <cdparam x="1041" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="208" id="69" />
-<P2  x="1178" y="276" id="67" />
+<P1  x="1167" y="198" id="204" />
+<P2  x="1167" y="266" id="206" />
 <Point x="1227" y="207" />
 <Point x="1227" y="247" />
 <AutomaticDrawing  data="true" />
@@ -243,8 +243,8 @@
 <cdparam x="877" y="343" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="Connector between ports" />
-<P1  x="1178" y="454" id="65" />
-<P2  x="1222" y="441" id="123" />
+<P1  x="1167" y="444" id="208" />
+<P2  x="1232" y="431" id="150" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1202" id="53" >
@@ -272,14 +272,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="32" >
 <father id="53" num="0" />
-<cdparam x="443" y="116" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="388" y="83" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
 <TGConnectingPoint num="0" id="31" />
 <extraparam>
-<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -289,16 +289,16 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="34" >
 <father id="53" num="1" />
-<cdparam x="440" y="156" />
+<cdparam x="440" y="322" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
 <TGConnectingPoint num="0" id="33" />
 <extraparam>
-<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -306,14 +306,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="36" >
 <father id="53" num="2" />
-<cdparam x="440" y="286" />
+<cdparam x="440" y="247" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
 <TGConnectingPoint num="0" id="35" />
 <extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -340,14 +340,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="40" >
 <father id="53" num="4" />
-<cdparam x="440" y="247" />
+<cdparam x="440" y="286" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
 <TGConnectingPoint num="0" id="39" />
 <extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="data_Ready_SC" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -357,16 +357,16 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="42" >
 <father id="53" num="5" />
-<cdparam x="440" y="322" />
+<cdparam x="440" y="156" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<infoparam name="TGComponent" value="Event data_Ready" />
 <TGConnectingPoint num="0" id="41" />
 <extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -374,14 +374,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="44" >
 <father id="53" num="6" />
-<cdparam x="388" y="83" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="443" y="116" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="277" minY="-13" maxY="263" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<cdrectangleparam minX="-10" maxX="280" minY="-10" maxY="266" />
+<infoparam name="TGComponent" value="Request activation" />
 <TGConnectingPoint num="0" id="43" />
 <extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="activation" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -428,61 +428,61 @@
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1200" id="146" >
+<SUBCOMPONENT type="1201" id="81" >
 <father id="238" num="0" />
-<cdparam x="842" y="133" />
-<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="521" y="369" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="138" />
-<TGConnectingPoint num="1" id="139" />
-<TGConnectingPoint num="2" id="140" />
-<TGConnectingPoint num="3" id="141" />
-<TGConnectingPoint num="4" id="142" />
-<TGConnectingPoint num="5" id="143" />
-<TGConnectingPoint num="6" id="144" />
-<TGConnectingPoint num="7" id="145" />
-<extraparam>
-<info hiddeni="false" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="103" >
-<father id="146" num="0" />
-<cdparam x="931" y="167" />
-<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="63" />
+<TGConnectingPoint num="1" id="64" />
+<TGConnectingPoint num="2" id="65" />
+<TGConnectingPoint num="3" id="66" />
+<TGConnectingPoint num="4" id="67" />
+<TGConnectingPoint num="5" id="68" />
+<TGConnectingPoint num="6" id="69" />
+<TGConnectingPoint num="7" id="70" />
+<TGConnectingPoint num="8" id="71" />
+<TGConnectingPoint num="9" id="72" />
+<TGConnectingPoint num="10" id="73" />
+<TGConnectingPoint num="11" id="74" />
+<TGConnectingPoint num="12" id="75" />
+<TGConnectingPoint num="13" id="76" />
+<TGConnectingPoint num="14" id="77" />
+<TGConnectingPoint num="15" id="78" />
+<TGConnectingPoint num="16" id="79" />
+<TGConnectingPoint num="17" id="80" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="108" >
+<father id="238" num="1" />
+<cdparam x="565" y="416" />
+<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
-<infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="95" />
-<TGConnectingPoint num="1" id="96" />
-<TGConnectingPoint num="2" id="97" />
-<TGConnectingPoint num="3" id="98" />
-<TGConnectingPoint num="4" id="99" />
-<TGConnectingPoint num="5" id="100" />
-<TGConnectingPoint num="6" id="101" />
-<TGConnectingPoint num="7" id="102" />
+<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
+<infoparam name="TGComponent" value="Application" />
+<TGConnectingPoint num="0" id="100" />
+<TGConnectingPoint num="1" id="101" />
+<TGConnectingPoint num="2" id="102" />
+<TGConnectingPoint num="3" id="103" />
+<TGConnectingPoint num="4" id="104" />
+<TGConnectingPoint num="5" id="105" />
+<TGConnectingPoint num="6" id="106" />
+<TGConnectingPoint num="7" id="107" />
 <extraparam>
 <Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
-<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
-<Attribute access="2" id="i" value="" type="0" typeOther="" />
-<Attribute access="2" id="j" value="" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="64" >
-<father id="103" num="0" />
-<cdparam x="1012" y="471" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="83" >
+<father id="108" num="0" />
+<cdparam x="741" y="406" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="63" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="82" />
 <extraparam>
-<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -490,16 +490,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="66" >
-<father id="103" num="1" />
-<cdparam x="1157" y="444" />
+<SUBCOMPONENT type="1203" id="85" >
+<father id="108" num="1" />
+<cdparam x="795" y="419" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="65" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="84" />
 <extraparam>
-<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -507,16 +507,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="68" >
-<father id="103" num="2" />
-<cdparam x="1157" y="266" />
+<SUBCOMPONENT type="1203" id="87" >
+<father id="108" num="2" />
+<cdparam x="795" y="481" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="67" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="86" />
 <extraparam>
-<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -524,16 +524,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="70" >
-<father id="103" num="3" />
-<cdparam x="1157" y="198" />
+<SUBCOMPONENT type="1203" id="89" >
+<father id="108" num="3" />
+<cdparam x="795" y="448" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="69" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="88" />
 <extraparam>
-<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -541,16 +541,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="72" >
-<father id="103" num="4" />
-<cdparam x="1157" y="405" />
+<SUBCOMPONENT type="1203" id="91" >
+<father id="108" num="4" />
+<cdparam x="795" y="509" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="71" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="90" />
 <extraparam>
-<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -558,16 +558,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="74" >
-<father id="103" num="5" />
-<cdparam x="1157" y="370" />
+<SUBCOMPONENT type="1203" id="93" >
+<father id="108" num="5" />
+<cdparam x="795" y="542" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="73" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="92" />
 <extraparam>
-<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -575,16 +575,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="76" >
-<father id="103" num="6" />
-<cdparam x="921" y="466" />
+<SUBCOMPONENT type="1203" id="95" >
+<father id="108" num="6" />
+<cdparam x="659" y="406" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="75" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="94" />
 <extraparam>
-<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -592,16 +592,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="78" >
-<father id="103" num="7" />
-<cdparam x="959" y="474" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="97" >
+<father id="108" num="7" />
+<cdparam x="697" y="403" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="77" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="96" />
 <extraparam>
-<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -609,16 +609,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="80" >
-<father id="103" num="8" />
-<cdparam x="921" y="387" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="99" >
+<father id="108" num="8" />
+<cdparam x="748" y="548" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="79" />
+<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="98" />
 <extraparam>
-<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -626,33 +626,43 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="82" >
-<father id="103" num="9" />
-<cdparam x="921" y="416" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="145" >
+<father id="238" num="2" />
+<cdparam x="534" y="97" />
+<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="81" />
+<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
+<infoparam name="TGComponent" value="SmartCard" />
+<TGConnectingPoint num="0" id="137" />
+<TGConnectingPoint num="1" id="138" />
+<TGConnectingPoint num="2" id="139" />
+<TGConnectingPoint num="3" id="140" />
+<TGConnectingPoint num="4" id="141" />
+<TGConnectingPoint num="5" id="142" />
+<TGConnectingPoint num="6" id="143" />
+<TGConnectingPoint num="7" id="144" />
 <extraparam>
-<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="" type="4" typeOther="" />
+<Attribute access="2" id="i" value="0" type="0" typeOther="" />
+<Attribute access="2" id="j" value="0" type="0" typeOther="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
+<Attribute access="2" id="t" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="84" >
-<father id="103" num="10" />
-<cdparam x="921" y="443" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="110" >
+<father id="145" num="0" />
+<cdparam x="721" y="111" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="83" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="109" />
 <extraparam>
-<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -660,16 +670,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="86" >
-<father id="103" num="11" />
-<cdparam x="921" y="352" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="112" >
+<father id="145" num="1" />
+<cdparam x="580" y="84" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="85" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event reset, pTS, end" />
+<TGConnectingPoint num="0" id="111" />
 <extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -677,16 +687,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="88" >
-<father id="103" num="12" />
-<cdparam x="918" y="317" />
+<SUBCOMPONENT type="1203" id="114" >
+<father id="145" num="2" />
+<cdparam x="543" y="321" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="87" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<TGConnectingPoint num="0" id="113" />
 <extraparam>
-<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -694,16 +704,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="90" >
-<father id="103" num="13" />
-<cdparam x="918" y="278" />
+<SUBCOMPONENT type="1203" id="116" >
+<father id="145" num="3" />
+<cdparam x="521" y="247" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="89" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<TGConnectingPoint num="0" id="115" />
 <extraparam>
-<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -711,16 +721,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="92" >
-<father id="103" num="14" />
-<cdparam x="918" y="235" />
+<SUBCOMPONENT type="1203" id="118" >
+<father id="145" num="4" />
+<cdparam x="521" y="202" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="91" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromDtoSC" />
+<TGConnectingPoint num="0" id="117" />
 <extraparam>
-<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -728,16 +738,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="94" >
-<father id="103" num="15" />
-<cdparam x="918" y="185" />
+<SUBCOMPONENT type="1203" id="120" >
+<father id="145" num="5" />
+<cdparam x="521" y="282" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="93" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<TGConnectingPoint num="0" id="119" />
 <extraparam>
-<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -745,62 +755,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="122" >
-<father id="146" num="1" />
-<cdparam x="829" y="362" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="104" />
-<TGConnectingPoint num="1" id="105" />
-<TGConnectingPoint num="2" id="106" />
-<TGConnectingPoint num="3" id="107" />
-<TGConnectingPoint num="4" id="108" />
-<TGConnectingPoint num="5" id="109" />
-<TGConnectingPoint num="6" id="110" />
-<TGConnectingPoint num="7" id="111" />
-<TGConnectingPoint num="8" id="112" />
-<TGConnectingPoint num="9" id="113" />
-<TGConnectingPoint num="10" id="114" />
-<TGConnectingPoint num="11" id="115" />
-<TGConnectingPoint num="12" id="116" />
-<TGConnectingPoint num="13" id="117" />
-<TGConnectingPoint num="14" id="118" />
-<TGConnectingPoint num="15" id="119" />
-<TGConnectingPoint num="16" id="120" />
-<TGConnectingPoint num="17" id="121" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="137" >
-<father id="146" num="2" />
-<cdparam x="1232" y="328" />
-<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="122" >
+<father id="145" num="6" />
+<cdparam x="521" y="156" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="129" />
-<TGConnectingPoint num="1" id="130" />
-<TGConnectingPoint num="2" id="131" />
-<TGConnectingPoint num="3" id="132" />
-<TGConnectingPoint num="4" id="133" />
-<TGConnectingPoint num="5" id="134" />
-<TGConnectingPoint num="6" id="135" />
-<TGConnectingPoint num="7" id="136" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event data_Ready" />
+<TGConnectingPoint num="0" id="121" />
 <extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="124" >
-<father id="137" num="0" />
-<cdparam x="1222" y="431" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="145" num="7" />
+<cdparam x="721" y="269" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event stop" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
 <TGConnectingPoint num="0" id="123" />
 <extraparam>
-<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -809,15 +790,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="126" >
-<father id="137" num="1" />
-<cdparam x="1222" y="403" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="145" num="8" />
+<cdparam x="721" y="235" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Request req_Timer" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
 <TGConnectingPoint num="0" id="125" />
 <extraparam>
-<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -826,15 +807,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="128" >
-<father id="137" num="2" />
-<cdparam x="1222" y="368" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="145" num="9" />
+<cdparam x="721" y="190" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
-<infoparam name="TGComponent" value="Event timeOut" />
+<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
+<infoparam name="TGComponent" value="Event receive" />
 <TGConnectingPoint num="0" id="127" />
 <extraparam>
-<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -842,43 +823,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="183" >
-<father id="238" num="1" />
-<cdparam x="534" y="97" />
-<sizeparam width="200" height="237" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="735" minY="0" maxY="293" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="175" />
-<TGConnectingPoint num="1" id="176" />
-<TGConnectingPoint num="2" id="177" />
-<TGConnectingPoint num="3" id="178" />
-<TGConnectingPoint num="4" id="179" />
-<TGConnectingPoint num="5" id="180" />
-<TGConnectingPoint num="6" id="181" />
-<TGConnectingPoint num="7" id="182" />
-<extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
-<Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
-<Attribute access="2" id="a" value="0" type="0" typeOther="" />
-<Attribute access="2" id="b" value="" type="4" typeOther="" />
-<Attribute access="2" id="i" value="0" type="0" typeOther="" />
-<Attribute access="2" id="j" value="0" type="0" typeOther="" />
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
-<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
-<Attribute access="2" id="t" value="" type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="148" >
-<father id="183" num="0" />
-<cdparam x="680" y="321" />
+<SUBCOMPONENT type="1203" id="130" >
+<father id="145" num="10" />
+<cdparam x="721" y="301" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="147" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="129" />
 <extraparam>
-<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -886,16 +840,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="150" >
-<father id="183" num="1" />
-<cdparam x="620" y="324" />
+<SUBCOMPONENT type="1203" id="132" >
+<father id="145" num="11" />
+<cdparam x="524" y="116" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="149" />
+<infoparam name="TGComponent" value="Request activation" />
+<TGConnectingPoint num="0" id="131" />
 <extraparam>
-<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -903,16 +857,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="152" >
-<father id="183" num="2" />
-<cdparam x="524" y="116" />
+<SUBCOMPONENT type="1203" id="134" >
+<father id="145" num="12" />
+<cdparam x="620" y="324" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="190" minY="-10" maxY="227" />
-<infoparam name="TGComponent" value="Request activation" />
-<TGConnectingPoint num="0" id="151" />
+<infoparam name="TGComponent" value="Request start_Application" />
+<TGConnectingPoint num="0" id="133" />
 <extraparam>
-<Prop commName="activation" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_Application" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -920,16 +874,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="154" >
-<father id="183" num="3" />
-<cdparam x="721" y="301" />
+<SUBCOMPONENT type="1203" id="136" >
+<father id="145" num="13" />
+<cdparam x="680" y="321" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="153" />
+<infoparam name="Primitive port" value="Event connectionOpened" />
+<TGConnectingPoint num="0" id="135" />
 <extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="connectionOpened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -937,16 +891,55 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="156" >
-<father id="183" num="4" />
-<cdparam x="721" y="190" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1200" id="229" >
+<father id="238" num="3" />
+<cdparam x="842" y="133" />
+<sizeparam width="570" height="485" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="155" />
+<cdrectangleparam minX="0" maxX="365" minY="0" maxY="45" />
+<infoparam name="TGComponent" value="TCPIP Entities" />
+<TGConnectingPoint num="0" id="221" />
+<TGConnectingPoint num="1" id="222" />
+<TGConnectingPoint num="2" id="223" />
+<TGConnectingPoint num="3" id="224" />
+<TGConnectingPoint num="4" id="225" />
+<TGConnectingPoint num="5" id="226" />
+<TGConnectingPoint num="6" id="227" />
+<TGConnectingPoint num="7" id="228" />
 <extraparam>
-<Prop commName="receive" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="160" >
+<father id="229" num="0" />
+<cdparam x="1232" y="328" />
+<sizeparam width="140" height="141" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="430" minY="0" maxY="344" />
+<infoparam name="TGComponent" value="Timer" />
+<TGConnectingPoint num="0" id="152" />
+<TGConnectingPoint num="1" id="153" />
+<TGConnectingPoint num="2" id="154" />
+<TGConnectingPoint num="3" id="155" />
+<TGConnectingPoint num="4" id="156" />
+<TGConnectingPoint num="5" id="157" />
+<TGConnectingPoint num="6" id="158" />
+<TGConnectingPoint num="7" id="159" />
+<extraparam>
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="147" >
+<father id="160" num="0" />
+<cdparam x="1222" y="368" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="146" />
+<extraparam>
+<Prop commName="timeOut" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -954,16 +947,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="158" >
-<father id="183" num="5" />
-<cdparam x="721" y="235" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="149" >
+<father id="160" num="1" />
+<cdparam x="1222" y="403" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="157" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="148" />
 <extraparam>
-<Prop commName="fromPtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="req_Timer" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -971,16 +964,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="160" >
-<father id="183" num="6" />
-<cdparam x="721" y="269" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="151" >
+<father id="160" num="2" />
+<cdparam x="1222" y="431" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="159" />
+<cdrectangleparam minX="-10" maxX="130" minY="-10" maxY="131" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="150" />
 <extraparam>
-<Prop commName="fromTtoP" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="stop" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -988,33 +981,68 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="162" >
-<father id="183" num="7" />
-<cdparam x="521" y="156" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="179" >
+<father id="229" num="1" />
+<cdparam x="829" y="362" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="472" />
+<infoparam name="Composite port" value="" />
 <TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
+<TGConnectingPoint num="2" id="163" />
+<TGConnectingPoint num="3" id="164" />
+<TGConnectingPoint num="4" id="165" />
+<TGConnectingPoint num="5" id="166" />
+<TGConnectingPoint num="6" id="167" />
+<TGConnectingPoint num="7" id="168" />
+<TGConnectingPoint num="8" id="169" />
+<TGConnectingPoint num="9" id="170" />
+<TGConnectingPoint num="10" id="171" />
+<TGConnectingPoint num="11" id="172" />
+<TGConnectingPoint num="12" id="173" />
+<TGConnectingPoint num="13" id="174" />
+<TGConnectingPoint num="14" id="175" />
+<TGConnectingPoint num="15" id="176" />
+<TGConnectingPoint num="16" id="177" />
+<TGConnectingPoint num="17" id="178" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="220" >
+<father id="229" num="2" />
+<cdparam x="931" y="167" />
+<sizeparam width="236" height="317" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="334" minY="0" maxY="168" />
+<infoparam name="TGComponent" value="TCPIP" />
+<TGConnectingPoint num="0" id="212" />
+<TGConnectingPoint num="1" id="213" />
+<TGConnectingPoint num="2" id="214" />
+<TGConnectingPoint num="3" id="215" />
+<TGConnectingPoint num="4" id="216" />
+<TGConnectingPoint num="5" id="217" />
+<TGConnectingPoint num="6" id="218" />
+<TGConnectingPoint num="7" id="219" />
 <extraparam>
-<Prop commName="data_Ready" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="uint_16" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Attribute access="2" id="wind" value="64" type="0" typeOther="" />
+<Attribute access="2" id="seqNum" value="0" type="0" typeOther="" />
+<Attribute access="2" id="i" value="" type="0" typeOther="" />
+<Attribute access="2" id="j" value="" type="0" typeOther="" />
+<Attribute access="2" id="a" value="0" type="0" typeOther="" />
+<Attribute access="2" id="b" value="0" type="0" typeOther="" />
+<Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="164" >
-<father id="183" num="8" />
-<cdparam x="521" y="282" />
+<SUBCOMPONENT type="1203" id="181" >
+<father id="220" num="0" />
+<cdparam x="918" y="185" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="163" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="180" />
 <extraparam>
-<Prop commName="data_Ready_SC" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1022,16 +1050,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="166" >
-<father id="183" num="9" />
-<cdparam x="521" y="202" />
+<SUBCOMPONENT type="1203" id="183" >
+<father id="220" num="1" />
+<cdparam x="918" y="235" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="165" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="182" />
 <extraparam>
-<Prop commName="fromDtoSC" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="null" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1039,16 +1067,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="168" >
-<father id="183" num="10" />
-<cdparam x="521" y="247" />
+<SUBCOMPONENT type="1203" id="185" >
+<father id="220" num="2" />
+<cdparam x="918" y="278" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="167" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="184" />
 <extraparam>
-<Prop commName="fromSCtoD" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromPtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1056,16 +1084,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="170" >
-<father id="183" num="11" />
-<cdparam x="543" y="321" />
+<SUBCOMPONENT type="1203" id="187" >
+<father id="220" num="3" />
+<cdparam x="918" y="317" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="169" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="186" />
 <extraparam>
-<Prop commName="answerToReset, pTSConfirm" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoP" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1073,16 +1101,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="172" >
-<father id="183" num="12" />
-<cdparam x="580" y="84" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="189" >
+<father id="220" num="4" />
+<cdparam x="921" y="352" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event reset, pTS, end" />
-<TGConnectingPoint num="0" id="171" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="188" />
 <extraparam>
-<Prop commName="reset, pTS, end" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="start_TCP_IP" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1090,16 +1118,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="174" >
-<father id="183" num="13" />
-<cdparam x="721" y="111" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="191" >
+<father id="220" num="5" />
+<cdparam x="921" y="443" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="224" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="173" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="190" />
 <extraparam>
-<Prop commName="send" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="send_TCP" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1107,35 +1135,33 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="210" >
-<father id="238" num="2" />
-<cdparam x="565" y="416" />
-<sizeparam width="240" height="145" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="193" >
+<father id="220" num="6" />
+<cdparam x="921" y="416" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="695" minY="0" maxY="385" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="202" />
-<TGConnectingPoint num="1" id="203" />
-<TGConnectingPoint num="2" id="204" />
-<TGConnectingPoint num="3" id="205" />
-<TGConnectingPoint num="4" id="206" />
-<TGConnectingPoint num="5" id="207" />
-<TGConnectingPoint num="6" id="208" />
-<TGConnectingPoint num="7" id="209" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="192" />
 <extraparam>
-<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
+<Prop commName="open, abort, close" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="185" >
-<father id="210" num="0" />
-<cdparam x="748" y="548" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="195" >
+<father id="220" num="7" />
+<cdparam x="921" y="387" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event opened" />
-<TGConnectingPoint num="0" id="184" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
+<TGConnectingPoint num="0" id="194" />
 <extraparam>
-<Prop commName="opened" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromTtoA" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1143,16 +1169,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="187" >
-<father id="210" num="1" />
-<cdparam x="697" y="403" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="197" >
+<father id="220" num="8" />
+<cdparam x="959" y="474" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="227" minY="-13" maxY="132" />
-<infoparam name="Primitive port" value="Event connectionOpened" />
-<TGConnectingPoint num="0" id="186" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="196" />
 <extraparam>
-<Prop commName="connectionOpened" commType="1" origin="true" finite="true" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="fromAtoT" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1160,16 +1186,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="189" >
-<father id="210" num="2" />
-<cdparam x="659" y="406" />
+<SUBCOMPONENT type="1203" id="199" >
+<father id="220" num="9" />
+<cdparam x="921" y="466" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_Application" />
-<TGConnectingPoint num="0" id="188" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="198" />
 <extraparam>
-<Prop commName="start_Application" commType="2" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="receive_Application" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1177,16 +1203,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="191" >
-<father id="210" num="3" />
-<cdparam x="795" y="542" />
+<SUBCOMPONENT type="1203" id="201" >
+<father id="220" num="10" />
+<cdparam x="1157" y="370" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="190" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="200" />
 <extraparam>
-<Prop commName="fromAtoT" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="timeOut" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1194,16 +1220,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="193" >
-<father id="210" num="4" />
-<cdparam x="795" y="509" />
+<SUBCOMPONENT type="1203" id="203" >
+<father id="220" num="11" />
+<cdparam x="1157" y="405" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="192" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="202" />
 <extraparam>
-<Prop commName="receive_Application" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="req_Timer" commType="2" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1211,16 +1237,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="195" >
-<father id="210" num="5" />
-<cdparam x="795" y="448" />
+<SUBCOMPONENT type="1203" id="205" >
+<father id="220" num="12" />
+<cdparam x="1157" y="198" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="194" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="204" />
 <extraparam>
-<Prop commName="open, abort, close" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="temp" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1228,16 +1254,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="197" >
-<father id="210" num="6" />
-<cdparam x="795" y="481" />
+<SUBCOMPONENT type="1203" id="207" >
+<father id="220" num="13" />
+<cdparam x="1157" y="266" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="196" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="206" />
 <extraparam>
-<Prop commName="send_TCP" commType="1" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="temp" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1245,16 +1271,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="199" >
-<father id="210" num="7" />
-<cdparam x="795" y="419" />
+<SUBCOMPONENT type="1203" id="209" >
+<father id="220" num="14" />
+<cdparam x="1157" y="444" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="198" />
+<cdrectangleparam minX="-10" maxX="226" minY="-10" maxY="307" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="208" />
 <extraparam>
-<Prop commName="fromTtoA" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="stop" commType="1" origin="true" finite="true" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1262,16 +1288,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="201" >
-<father id="210" num="8" />
-<cdparam x="741" y="406" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="211" >
+<father id="220" num="15" />
+<cdparam x="1012" y="471" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="135" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="200" />
+<cdrectangleparam minX="-13" maxX="223" minY="-13" maxY="304" />
+<infoparam name="Primitive port" value="Event opened" />
+<TGConnectingPoint num="0" id="210" />
 <extraparam>
-<Prop commName="start_TCP_IP" commType="2" origin="true" finite="false" blocking="false" maxSamples="1" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
+<Prop commName="opened" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="-1" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1279,32 +1305,6 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="229" >
-<father id="238" num="3" />
-<cdparam x="521" y="369" />
-<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="922" minY="-13" maxY="517" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="211" />
-<TGConnectingPoint num="1" id="212" />
-<TGConnectingPoint num="2" id="213" />
-<TGConnectingPoint num="3" id="214" />
-<TGConnectingPoint num="4" id="215" />
-<TGConnectingPoint num="5" id="216" />
-<TGConnectingPoint num="6" id="217" />
-<TGConnectingPoint num="7" id="218" />
-<TGConnectingPoint num="8" id="219" />
-<TGConnectingPoint num="9" id="220" />
-<TGConnectingPoint num="10" id="221" />
-<TGConnectingPoint num="11" id="222" />
-<TGConnectingPoint num="12" id="223" />
-<TGConnectingPoint num="13" id="224" />
-<TGConnectingPoint num="14" id="225" />
-<TGConnectingPoint num="15" id="226" />
-<TGConnectingPoint num="16" id="227" />
-<TGConnectingPoint num="17" id="228" />
-</SUBCOMPONENT>
 
 
 </TMLComponentTaskDiagramPanel>
@@ -6698,11 +6698,11 @@ the smart card and the terminal
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="1484" >
 <father id="1545" num="0" />
-<cdparam x="152" y="154" />
-<sizeparam width="163" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="286" y="304" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
+<cdrectangleparam minX="0" maxX="350" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Timer" />
 <TGConnectingPoint num="0" id="1476" />
 <TGConnectingPoint num="1" id="1477" />
 <TGConnectingPoint num="2" id="1478" />
@@ -6712,16 +6712,16 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1482" />
 <TGConnectingPoint num="7" id="1483" />
 <extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1493" >
 <father id="1545" num="1" />
-<cdparam x="351" y="153" />
-<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="350" y="234" />
+<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Application" />
 <TGConnectingPoint num="0" id="1485" />
 <TGConnectingPoint num="1" id="1486" />
 <TGConnectingPoint num="2" id="1487" />
@@ -6731,7 +6731,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1491" />
 <TGConnectingPoint num="7" id="1492" />
 <extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1502" >
@@ -6755,11 +6755,11 @@ the smart card and the terminal
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1511" >
 <father id="1545" num="3" />
-<cdparam x="350" y="234" />
-<sizeparam width="139" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="351" y="153" />
+<sizeparam width="136" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="320" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="323" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
 <TGConnectingPoint num="0" id="1503" />
 <TGConnectingPoint num="1" id="1504" />
 <TGConnectingPoint num="2" id="1505" />
@@ -6769,16 +6769,16 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1509" />
 <TGConnectingPoint num="7" id="1510" />
 <extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1520" >
 <father id="1545" num="4" />
-<cdparam x="286" y="304" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="152" y="154" />
+<sizeparam width="163" 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" />
-<infoparam name="TGComponent" value="AppC::Timer" />
+<cdrectangleparam minX="0" maxX="296" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
 <TGConnectingPoint num="0" id="1512" />
 <TGConnectingPoint num="1" id="1513" />
 <TGConnectingPoint num="2" id="1514" />
@@ -6788,7 +6788,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1518" />
 <TGConnectingPoint num="7" id="1519" />
 <extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6990,11 +6990,11 @@ the smart card and the terminal
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="1640" >
 <father id="1683" num="0" />
-<cdparam x="272" y="94" />
-<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="387" y="123" />
+<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
+<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
 <TGConnectingPoint num="0" id="1632" />
 <TGConnectingPoint num="1" id="1633" />
 <TGConnectingPoint num="2" id="1634" />
@@ -7004,7 +7004,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1638" />
 <TGConnectingPoint num="7" id="1639" />
 <extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1649" >
@@ -7028,11 +7028,11 @@ the smart card and the terminal
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1658" >
 <father id="1683" num="2" />
-<cdparam x="387" y="123" />
-<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="272" y="94" />
+<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
 <TGConnectingPoint num="0" id="1650" />
 <TGConnectingPoint num="1" id="1651" />
 <TGConnectingPoint num="2" id="1652" />
@@ -7042,7 +7042,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1656" />
 <TGConnectingPoint num="7" id="1657" />
 <extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7378,11 +7378,11 @@ the smart card and the terminal
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="1848" >
 <father id="1891" num="0" />
-<cdparam x="271" y="73" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="341" y="178" />
+<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
 <TGConnectingPoint num="0" id="1840" />
 <TGConnectingPoint num="1" id="1841" />
 <TGConnectingPoint num="2" id="1842" />
@@ -7392,7 +7392,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1846" />
 <TGConnectingPoint num="7" id="1847" />
 <extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1857" >
@@ -7416,11 +7416,11 @@ the smart card and the terminal
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1866" >
 <father id="1891" num="2" />
-<cdparam x="341" y="178" />
-<sizeparam width="108" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="271" y="73" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="205" minY="0" maxY="161" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
+<cdrectangleparam minX="0" maxX="174" minY="0" maxY="161" />
+<infoparam name="TGComponent" value="AppC::Application" />
 <TGConnectingPoint num="0" id="1858" />
 <TGConnectingPoint num="1" id="1859" />
 <TGConnectingPoint num="2" id="1860" />
@@ -7430,7 +7430,7 @@ the smart card and the terminal
 <TGConnectingPoint num="6" id="1864" />
 <TGConnectingPoint num="7" id="1865" />
 <extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operationMEC="Application" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
diff --git a/modeling/DIPLODOCUS/ZigBeeTutorial.xml b/modeling/DIPLODOCUS/ZigBeeTutorial.xml
index 430da1138544b7a59c77b8a646293ea19e2f8c62..419f194180db93da8248318713825bad16f5d22a 100644
--- a/modeling/DIPLODOCUS/ZigBeeTutorial.xml
+++ b/modeling/DIPLODOCUS/ZigBeeTutorial.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta">
+<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="9" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
 <DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -178,7 +178,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="42" >
 <father id="43" num="0" />
 <cdparam x="1446" y="393" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -228,7 +228,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="48" >
 <father id="50" num="0" />
 <cdparam x="1432" y="523" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -236,7 +236,7 @@
 <SUBCOMPONENT type="-1" id="49" >
 <father id="50" num="1" />
 <cdparam x="1432" y="410" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -270,7 +270,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="53" >
 <father id="55" num="0" />
 <cdparam x="1430" y="262" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -278,7 +278,7 @@
 <SUBCOMPONENT type="-1" id="54" >
 <father id="55" num="1" />
 <cdparam x="1430" y="354" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -303,7 +303,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="57" >
 <father id="58" num="0" />
 <cdparam x="1446" y="124" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -336,7 +336,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="61" >
 <father id="62" num="0" />
 <cdparam x="1133" y="388" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -370,7 +370,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="65" >
 <father id="67" num="0" />
 <cdparam x="1103" y="376" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -378,7 +378,7 @@
 <SUBCOMPONENT type="-1" id="66" >
 <father id="67" num="1" />
 <cdparam x="1103" y="262" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -412,7 +412,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="70" >
 <father id="72" num="0" />
 <cdparam x="1101" y="408" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -420,7 +420,7 @@
 <SUBCOMPONENT type="-1" id="71" >
 <father id="72" num="1" />
 <cdparam x="1101" y="500" />
-<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="0" maxX="2489" minY="0" maxY="1569" />
 <infoparam name="point " value="null" />
@@ -597,7 +597,7 @@
 </CONNECTOR><SUBCOMPONENT type="-1" id="93" >
 <father id="94" num="0" />
 <cdparam x="1133" y="123" />
-<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="0" maxX="3161" minY="0" maxY="1161" />
 <infoparam name="point " value="null" />
@@ -671,7 +671,7 @@
 <cdparam x="18" y="45" />
 <sizeparam width="224" height="51" minWidth="60" minHeight="23" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="1702" minY="0" maxY="563" />
+<cdrectangleparam minX="0" maxX="1701" minY="0" maxY="562" />
 <infoparam name="UML Note" value="In this model THE PARAMETER SIZE
 IS NOT MODIFIED according to the
 operations performed by the
@@ -807,7 +807,7 @@ processing tasks
 <TGConnectingPoint num="6" id="181" />
 <TGConnectingPoint num="7" id="182" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="127" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -861,7 +861,7 @@ processing tasks
 <TGConnectingPoint num="6" id="194" />
 <TGConnectingPoint num="7" id="195" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1012,7 +1012,7 @@ processing tasks
 <TGConnectingPoint num="6" id="275" />
 <TGConnectingPoint num="7" id="276" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1083,7 +1083,7 @@ processing tasks
 <TGConnectingPoint num="6" id="290" />
 <TGConnectingPoint num="7" id="291" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1277,7 +1277,7 @@ processing tasks
 <TGConnectingPoint num="6" id="390" />
 <TGConnectingPoint num="7" id="391" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1348,7 +1348,7 @@ processing tasks
 <TGConnectingPoint num="6" id="405" />
 <TGConnectingPoint num="7" id="406" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1568,7 +1568,7 @@ processing tasks
 <TGConnectingPoint num="6" id="526" />
 <TGConnectingPoint num="7" id="527" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1656,7 +1656,7 @@ processing tasks
 <TGConnectingPoint num="6" id="541" />
 <TGConnectingPoint num="7" id="542" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -1798,7 +1798,7 @@ processing tasks
 <TGConnectingPoint num="6" id="603" />
 <TGConnectingPoint num="7" id="604" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 <Attribute access="2" id="size_1" value="" type="0" typeOther="" />
 </extraparam>
@@ -1870,7 +1870,7 @@ processing tasks
 <TGConnectingPoint num="6" id="616" />
 <TGConnectingPoint num="7" id="617" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2047,7 +2047,7 @@ processing tasks
 <TGConnectingPoint num="6" id="716" />
 <TGConnectingPoint num="7" id="717" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2118,7 +2118,7 @@ processing tasks
 <TGConnectingPoint num="6" id="731" />
 <TGConnectingPoint num="7" id="732" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2312,7 +2312,7 @@ processing tasks
 <TGConnectingPoint num="6" id="831" />
 <TGConnectingPoint num="7" id="832" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2383,7 +2383,7 @@ processing tasks
 <TGConnectingPoint num="6" id="846" />
 <TGConnectingPoint num="7" id="847" />
 <extraparam>
-<Data isAttacker="No" Operation="" />
+<Data isAttacker="No" daemon="false" periodic="false" periodValue="" unit="" Operation="" />
 <Attribute access="2" id="size" value="" type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
@@ -2520,7 +2520,7 @@ processing tasks
 
 </TMLComponentTaskDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_Source" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1001" id="916" >
 <cdparam x="397" y="338" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -2584,7 +2584,7 @@ processing tasks
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="926" />
+<P1  x="407" y="70" id="926" />
 <P2  x="407" y="111" id="923" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2615,7 +2615,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_Source" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_Source" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1013" id="935" >
 <cdparam x="402" y="189" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -2665,7 +2665,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="941" />
 <TGConnectingPoint num="1" id="942" />
 <extraparam>
@@ -2695,7 +2695,7 @@ processing tasks
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="65" id="944" />
+<P1  x="407" y="70" id="944" />
 <P2  x="407" y="108" id="941" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2718,7 +2718,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_Symbol2ChipSeq" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1010" id="952" >
 <cdparam x="317" y="132" />
 <sizeparam width="156" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -2803,7 +2803,7 @@ processing tasks
 <cdparam x="395" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="395" y="81" id="961" />
+<P1  x="395" y="86" id="961" />
 <P2  x="395" y="127" id="950" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2818,7 +2818,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_Symbol2ChipSeq" minX="10" maxX="495" minY="10" maxY="467" >
+<TMLActivityDiagramPanel name="X_Symbol2ChipSeq" minX="10" maxX="495" minY="10" maxY="467" zoom="1.0" >
 <COMPONENT type="1021" id="970" >
 <cdparam x="393" y="289" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -2881,7 +2881,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="495" minY="10" maxY="467" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="979" />
 <TGConnectingPoint num="1" id="980" />
 <extraparam>
@@ -2919,7 +2919,7 @@ processing tasks
 <cdparam x="398" y="94" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="398" y="89" id="982" />
+<P1  x="398" y="94" id="982" />
 <P2  x="398" y="132" id="979" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -2942,7 +2942,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1010" id="991" >
 <cdparam x="333" y="128" />
 <sizeparam width="156" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3026,7 +3026,7 @@ processing tasks
 <cdparam x="411" y="82" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="411" y="77" id="1000" />
+<P1  x="411" y="82" id="1000" />
 <P2  x="411" y="123" id="989" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3041,7 +3041,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_Chip2Octet" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1021" id="1009" >
 <cdparam x="377" y="300" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3104,7 +3104,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="1018" />
 <TGConnectingPoint num="1" id="1019" />
 <extraparam>
@@ -3142,7 +3142,7 @@ processing tasks
 <cdparam x="382" y="96" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="382" y="91" id="1021" />
+<P1  x="382" y="96" id="1021" />
 <P2  x="382" y="134" id="1018" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3165,7 +3165,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_CWL" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1010" id="1030" >
 <cdparam x="360" y="134" />
 <sizeparam width="108" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3272,7 +3272,7 @@ processing tasks
 <cdparam x="414" y="88" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="414" y="83" id="1036" />
+<P1  x="414" y="88" id="1036" />
 <P2  x="414" y="129" id="1028" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3287,7 +3287,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_CWL" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_CWL" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1013" id="1052" >
 <cdparam x="402" y="277" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3350,7 +3350,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="1061" />
 <TGConnectingPoint num="1" id="1062" />
 <extraparam>
@@ -3388,7 +3388,7 @@ processing tasks
 <cdparam x="407" y="77" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="72" id="1064" />
+<P1  x="407" y="77" id="1064" />
 <P2  x="407" y="115" id="1061" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3411,7 +3411,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_Sink" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1001" id="1072" >
 <cdparam x="396" y="355" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3495,7 +3495,7 @@ processing tasks
 <cdparam x="407" y="93" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="407" y="88" id="1076" />
+<P1  x="407" y="93" id="1076" />
 <P2  x="407" y="134" id="1081" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3510,7 +3510,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_Sink" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_Sink" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1013" id="1091" >
 <cdparam x="445" y="298" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3559,7 +3559,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="1097" />
 <TGConnectingPoint num="1" id="1098" />
 <extraparam>
@@ -3597,7 +3597,7 @@ processing tasks
 <cdparam x="450" y="98" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="450" y="93" id="1100" />
+<P1  x="450" y="98" id="1100" />
 <P2  x="450" y="136" id="1097" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3612,7 +3612,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1010" id="1108" >
 <cdparam x="342" y="117" />
 <sizeparam width="122" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3696,7 +3696,7 @@ processing tasks
 <cdparam x="403" y="71" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="403" y="66" id="1117" />
+<P1  x="403" y="71" id="1117" />
 <P2  x="403" y="112" id="1106" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3711,7 +3711,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_CWP_Q" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1013" id="1126" >
 <cdparam x="365" y="275" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3774,7 +3774,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="1135" />
 <TGConnectingPoint num="1" id="1136" />
 <extraparam>
@@ -3812,7 +3812,7 @@ processing tasks
 <cdparam x="370" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="370" y="70" id="1138" />
+<P1  x="370" y="75" id="1138" />
 <P2  x="370" y="113" id="1135" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3835,7 +3835,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="F_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1010" id="1147" >
 <cdparam x="324" y="132" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3919,7 +3919,7 @@ processing tasks
 <cdparam x="379" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="379" y="81" id="1156" />
+<P1  x="379" y="86" id="1156" />
 <P2  x="379" y="127" id="1145" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -3934,7 +3934,7 @@ processing tasks
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="X_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLActivityDiagramPanel name="X_CWP_I" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1013" id="1165" >
 <cdparam x="369" y="290" />
 <sizeparam width="10" height="30" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -3997,7 +3997,7 @@ processing tasks
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read args" value="getReqArg (size)" />
+<infoparam name="read args" value="getReqArg(size)" />
 <TGConnectingPoint num="0" id="1174" />
 <TGConnectingPoint num="1" id="1175" />
 <extraparam>
@@ -4035,7 +4035,7 @@ processing tasks
 <cdparam x="374" y="90" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="374" y="85" id="1177" />
+<P1  x="374" y="90" id="1177" />
 <P2  x="374" y="128" id="1174" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -4064,7 +4064,7 @@ processing tasks
 
 
 <Modeling type="TML CP" nameTab="CP_Memory_Copy" >
-<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1507" id="1185" >
 <cdparam x="390" y="343" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4188,7 +4188,7 @@ processing tasks
 </CONNECTOR><SUBCOMPONENT type="-1" id="1233" >
 <father id="1234" num="0" />
 <cdparam x="400" y="199" />
-<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" />
@@ -4214,7 +4214,7 @@ processing tasks
 <cdparam x="221" y="23" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="223" y="52" id="1231" />
+<P1  x="223" y="57" id="1231" />
 <P2  x="223" y="103" id="1207" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -4229,7 +4229,7 @@ processing tasks
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="Configure" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="Configure" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1522" id="1313" >
 <cdparam x="220" y="55" />
 <sizeparam width="10" height="750" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4322,7 +4322,7 @@ processing tasks
 
 </TMLSDPanel>
 
-<TMLSDPanel name="TransferCycle" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="TransferCycle" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1520" id="1363" >
 <cdparam x="1079" y="58" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4705,7 +4705,7 @@ processing tasks
 
 
 <Modeling type="TML CP" nameTab="DMA_transfer" >
-<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="583" minY="10" maxY="412" >
+<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="583" minY="10" maxY="412" zoom="1.0" >
 <COMPONENT type="1507" id="1569" >
 <cdparam x="381" y="392" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -4870,7 +4870,7 @@ CPU via interrupts (no polling messages)
 </CONNECTOR><SUBCOMPONENT type="-1" id="1630" >
 <father id="1631" num="0" />
 <cdparam x="391" y="234" />
-<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" />
@@ -4896,14 +4896,14 @@ CPU via interrupts (no polling messages)
 <cdparam x="187" y="61" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="189" y="80" id="1626" />
+<P1  x="189" y="85" id="1626" />
 <P2  x="189" y="124" id="1615" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="ConfigureDMA_SD" minX="10" maxX="926" minY="10" maxY="556" >
+<TMLSDPanel name="ConfigureDMA_SD" minX="10" maxX="926" minY="10" maxY="556" zoom="1.0" >
 <COMPONENT type="1521" id="1684" >
 <cdparam x="466" y="56" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -5125,7 +5125,7 @@ CPU via interrupts (no polling messages)
 
 </TMLSDPanel>
 
-<TMLSDPanel name="DMACycle_SD" minX="10" maxX="912" minY="10" maxY="540" >
+<TMLSDPanel name="DMACycle_SD" minX="10" maxX="912" minY="10" maxY="540" zoom="1.0" >
 <COMPONENT type="1520" id="1836" >
 <cdparam x="832" y="39" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -5518,7 +5518,7 @@ CPU via interrupts (no polling messages)
 
 </TMLSDPanel>
 
-<TMLSDPanel name="TerminateDMA_SD" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="TerminateDMA_SD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1521" id="2099" >
 <cdparam x="332" y="52" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -5740,7 +5740,7 @@ CPU via interrupts (no polling messages)
 
 
 <Modeling type="TML CP" nameTab="DMATransferPolling" >
-<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1504" id="2212" >
 <cdparam x="86" y="250" />
 <sizeparam width="123" height="35" minWidth="70" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -5903,7 +5903,7 @@ POLLING
 <cdparam x="256" y="352" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="256" y="352" id="2229" />
+<P1  x="256" y="357" id="2229" />
 <P2  x="256" y="394" id="2271" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -5912,14 +5912,14 @@ POLLING
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <P1  x="147" y="290" id="2203" />
-<P2  x="206" y="347" id="2224" />
+<P2  x="206" y="342" id="2224" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="1501" id="2288" >
 <cdparam x="301" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="301" y="191" id="2243" />
+<P1  x="301" y="196" id="2243" />
 <P2  x="380" y="245" id="2213" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -5927,7 +5927,7 @@ POLLING
 <cdparam x="202" y="191" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="202" y="191" id="2239" />
+<P1  x="202" y="196" id="2239" />
 <P2  x="147" y="245" id="2202" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -5935,7 +5935,7 @@ POLLING
 <cdparam x="252" y="62" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="252" y="57" id="2284" />
+<P1  x="252" y="62" id="2284" />
 <P2  x="252" y="100" id="2273" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -5944,7 +5944,7 @@ POLLING
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <P1  x="252" y="145" id="2274" />
-<P2  x="252" y="186" id="2244" />
+<P2  x="252" y="181" id="2244" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="1501" id="2292" >
@@ -5952,13 +5952,13 @@ POLLING
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <P1  x="380" y="290" id="2214" />
-<P2  x="305" y="347" id="2228" />
+<P2  x="305" y="342" id="2228" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="ConfigureTransfer" minX="10" maxX="1259" minY="10" maxY="543" >
+<TMLSDPanel name="ConfigureTransfer" minX="10" maxX="1259" minY="10" maxY="543" zoom="1.0" >
 <COMPONENT type="1521" id="2342" >
 <cdparam x="600" y="43" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6222,7 +6222,7 @@ POLLING
 
 </TMLSDPanel>
 
-<CommunicationPatternDiagramPanel name="TransferCycleAD" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="TransferCycleAD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1505" id="2473" >
 <cdparam x="313" y="391" />
 <sizeparam width="124" height="35" minWidth="70" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6344,7 +6344,7 @@ POLLING
 </CONNECTOR><SUBCOMPONENT type="-1" id="2506" >
 <father id="2507" num="0" />
 <cdparam x="244" 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" />
@@ -6363,7 +6363,7 @@ POLLING
 </CONNECTOR><SUBCOMPONENT type="-1" id="2508" >
 <father id="2511" num="0" />
 <cdparam x="244" y="425" />
-<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" />
@@ -6371,7 +6371,7 @@ POLLING
 <SUBCOMPONENT type="-1" id="2509" >
 <father id="2511" num="1" />
 <cdparam x="136" y="425" />
-<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" />
@@ -6379,7 +6379,7 @@ POLLING
 <SUBCOMPONENT type="-1" id="2510" >
 <father id="2511" num="2" />
 <cdparam x="136" y="178" />
-<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" />
@@ -6398,21 +6398,21 @@ POLLING
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <P1  x="244" y="332" id="2495" />
-<P2  x="375" y="249" id="2477" />
+<P2  x="375" y="254" id="2477" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="1501" id="2514" >
 <cdparam x="375" y="115" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="393216000" y="120586240" id="2508" />
-<P2  x="393216000" y="170917888" id="2492" />
+<P1  x="-603979776" y="-872415232" id="2508" />
+<P2  x="-603979776" y="-1946157056" id="2492" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="TransferCycleSD" minX="10" maxX="1102" minY="10" maxY="556" >
+<TMLSDPanel name="TransferCycleSD" minX="10" maxX="1102" minY="10" maxY="556" zoom="1.0" >
 <COMPONENT type="1520" id="2564" >
 <cdparam x="1029" y="56" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6821,7 +6821,7 @@ POLLING
 
 </TMLSDPanel>
 
-<TMLSDPanel name="EnableFlag" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="EnableFlag" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1522" id="2838" >
 <cdparam x="354" y="61" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -6908,7 +6908,7 @@ POLLING
 
 </TMLSDPanel>
 
-<CommunicationPatternDiagramPanel name="PollingCycleAD" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="PollingCycleAD" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1507" id="2840" >
 <cdparam x="284" y="342" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7004,7 +7004,7 @@ POLLING
 <cdparam x="163" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="294" y="74" id="2868" />
+<P1  x="294" y="79" id="2868" />
 <P2  x="225" y="313" id="2863" />
 <Point x="163" y="389" />
 <Point x="55" y="389" />
@@ -7013,7 +7013,7 @@ POLLING
 </CONNECTOR><SUBCOMPONENT type="-1" id="2871" >
 <father id="2874" num="0" />
 <cdparam x="163" y="389" />
-<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" />
@@ -7021,7 +7021,7 @@ POLLING
 <SUBCOMPONENT type="-1" id="2872" >
 <father id="2874" num="1" />
 <cdparam x="55" y="389" />
-<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" />
@@ -7029,7 +7029,7 @@ POLLING
 <SUBCOMPONENT type="-1" id="2873" >
 <father id="2874" num="2" />
 <cdparam x="55" y="142" />
-<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" />
@@ -7046,7 +7046,7 @@ POLLING
 </CONNECTOR><SUBCOMPONENT type="-1" id="2875" >
 <father id="2876" num="0" />
 <cdparam x="163" y="238" />
-<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" />
@@ -7064,14 +7064,14 @@ POLLING
 <cdparam x="294" y="79" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="308281344" y="82837504" id="2878" />
-<P2  x="308281344" y="133169152" id="2862" />
+<P1  x="-1744830464" y="1006632960" id="2878" />
+<P2  x="-1744830464" y="-67108864" id="2862" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="PollingCycleSD" minX="10" maxX="720" minY="10" maxY="563" >
+<TMLSDPanel name="PollingCycleSD" minX="10" maxX="720" minY="10" maxY="563" zoom="1.0" >
 <COMPONENT type="1521" id="2928" >
 <cdparam x="414" y="63" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7341,7 +7341,7 @@ POLLING
 
 
 <Modeling type="TML CP" nameTab="Double_DMA_transfer" >
-<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="MainCP" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1507" id="3043" >
 <cdparam x="234" y="316" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7456,14 +7456,14 @@ INTERRUPTS
 <cdparam x="242" y="116" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="244" y="95" id="3044" />
+<P1  x="244" y="100" id="3044" />
 <P2  x="244" y="134" id="3074" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<CommunicationPatternDiagramPanel name="DMATransfer1" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="DMATransfer1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1507" id="3089" >
 <cdparam x="437" y="337" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7574,7 +7574,7 @@ INTERRUPTS
 </CONNECTOR><SUBCOMPONENT type="-1" id="3131" >
 <father id="3132" num="0" />
 <cdparam x="447" 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" />
@@ -7616,14 +7616,14 @@ INTERRUPTS
 <cdparam x="263" y="31" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="265" y="50" id="3129" />
+<P1  x="265" y="55" id="3129" />
 <P2  x="265" y="94" id="3118" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<CommunicationPatternDiagramPanel name="DMATransfer2" minX="10" maxX="1400" minY="10" maxY="900" >
+<CommunicationPatternDiagramPanel name="DMATransfer2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1507" id="3139" >
 <cdparam x="416" y="344" />
 <sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -7734,7 +7734,7 @@ INTERRUPTS
 </CONNECTOR><SUBCOMPONENT type="-1" id="3181" >
 <father id="3182" num="0" />
 <cdparam x="426" y="209" />
-<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" />
@@ -7776,14 +7776,14 @@ INTERRUPTS
 <cdparam x="238" y="35" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="240" y="54" id="3179" />
+<P1  x="240" y="59" id="3179" />
 <P2  x="240" y="98" id="3168" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </CommunicationPatternDiagramPanel>
 
-<TMLSDPanel name="ConfigureDMA_SD1" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="ConfigureDMA_SD1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1521" id="3237" >
 <cdparam x="386" y="56" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -8021,7 +8021,7 @@ INTERRUPTS
 
 </TMLSDPanel>
 
-<TMLSDPanel name="DMACycle_SD1" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="DMACycle_SD1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1520" id="3398" >
 <cdparam x="1072" y="56" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -8409,7 +8409,7 @@ INTERRUPTS
 
 </TMLSDPanel>
 
-<TMLSDPanel name="TerminateDMA_SD1" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="TerminateDMA_SD1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="301" id="3628" >
 <cdparam x="716" y="60" />
 <sizeparam width="344" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -8657,7 +8657,7 @@ sequence diagram.
 
 </TMLSDPanel>
 
-<TMLSDPanel name="ConfigureDMA_SD2" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="ConfigureDMA_SD2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1521" id="3830" >
 <cdparam x="384" y="54" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -8879,7 +8879,7 @@ sequence diagram.
 
 </TMLSDPanel>
 
-<TMLSDPanel name="DMACycle_SD2" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="DMACycle_SD2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1520" id="3982" >
 <cdparam x="1037" y="57" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -9267,7 +9267,7 @@ sequence diagram.
 
 </TMLSDPanel>
 
-<TMLSDPanel name="TerminateDMA_SD2" minX="10" maxX="1400" minY="10" maxY="900" >
+<TMLSDPanel name="TerminateDMA_SD2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
 <COMPONENT type="1521" id="4245" >
 <cdparam x="280" y="53" />
 <sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
@@ -9489,7 +9489,7 @@ sequence diagram.
 
 
 <Modeling type="TML Architecture" nameTab="Embb" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" zoom="1.0" >
 <COMPONENT type="1100" id="4372" >
 <cdparam x="560" y="807" />
 <sizeparam width="150" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -10735,7 +10735,7 @@ sequence diagram.
 
 
 <Modeling type="TML Architecture" nameTab="Mapping_0" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="100" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="100" zoom="1.0" >
 <COMPONENT type="1100" id="5025" >
 <cdparam x="560" y="807" />
 <sizeparam width="150" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -12445,7 +12445,7 @@ sequence diagram.
 
 
 <Modeling type="TML Architecture" nameTab="Mapping_1" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" zoom="1.0" >
 <COMPONENT type="1100" id="5876" >
 <cdparam x="560" y="807" />
 <sizeparam width="150" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
@@ -14154,7 +14154,7 @@ sequence diagram.
 
 
 <Modeling type="TML Architecture" nameTab="Mapping_2" >
-<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" >
+<TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1900" minY="10" maxY="1900" attributes="0" masterClockFrequency="200" zoom="1.0" >
 <COMPONENT type="1100" id="6727" >
 <cdparam x="560" y="807" />
 <sizeparam width="150" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
diff --git a/src/main/java/ui/ActionPerformer.java b/src/main/java/ui/ActionPerformer.java
index af62c015acc49cc28c656540e73e0e4af16e0e52..36457167f1e601fd999960dfd09ded7ef82ac5a2 100644
--- a/src/main/java/ui/ActionPerformer.java
+++ b/src/main/java/ui/ActionPerformer.java
@@ -57,7 +57,9 @@ public class ActionPerformer {
     public static void actionPerformed(MainGUI mgui, ActionEvent evt, String command, TDiagramPanel tdp1) {
 
         // Compare the action command to the known actions.
-        if (command.equals(mgui.actions[TGUIAction.ACT_NEW].getActionCommand())) {
+        if (command.equals(mgui.actions[TGUIAction.ACT_ACTION_MENU].getActionCommand())) {
+            mgui.popupMainCommand();
+        } else if (command.equals(mgui.actions[TGUIAction.ACT_NEW].getActionCommand())) {
             mgui.newProject();
         } else if (command.equals(mgui.actions[TGUIAction.ACT_NEW_PROJECT].getActionCommand())) {
             mgui.newProjectDir();
diff --git a/src/main/java/ui/JToolBarMainTurtle.java b/src/main/java/ui/JToolBarMainTurtle.java
index 1ea6152d386cd78676bbd2a47329e54d0be2c0ca..e02e75f823bf858e783a97ce3f255e5c4a905b43 100644
--- a/src/main/java/ui/JToolBarMainTurtle.java
+++ b/src/main/java/ui/JToolBarMainTurtle.java
@@ -49,8 +49,14 @@ import myutil.TraceManager;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.CancellationException;
 
 
 /**
@@ -60,17 +66,34 @@ import java.awt.event.ActionListener;
  * @author Ludovic APVRILLE
  */
 public  class JToolBarMainTurtle extends JToolBar implements ActionListener     {
+    private static int COMMON_ACTIONS [] = {TGUIAction.ACT_NEW, TGUIAction.ACT_NEW_PROJECT, TGUIAction.ACT_OPEN,
+            TGUIAction.ACT_OPEN_PROJECT, TGUIAction.ACT_SAVE, -1, TGUIAction.ACT_CUT, TGUIAction.ACT_COPY, TGUIAction.ACT_PASTE,
+            TGUIAction.ACT_DELETE, TGUIAction.MOVE_ENABLED, TGUIAction.FIRST_DIAGRAM, -1, TGUIAction.ACT_BACKWARD, TGUIAction.ACT_FORWARD,
+            -1, TGUIAction.ACT_ZOOM_LESS, TGUIAction.ACT_SHOW_ZOOM, TGUIAction.ACT_ZOOM_MORE, -1, -1, TGUIAction.ACT_MODEL_CHECKING};
+
     // Avatar
-    JButton  avatarSimu, avatarFVUPPAAL, avatarFVProVerif, avatarFVStaticAnalysis, avatarCodeGeneration, avatarMC;
+    private JButton  avatarSimu, avatarFVUPPAAL, avatarFVProVerif, avatarFVStaticAnalysis, avatarCodeGeneration, avatarMC;
+    private JMenuItem avatarSimuMI, avatarFVUPPAALMI, avatarFVProVerifMI, avatarFVStaticAnalysisMI, avatarCodeGenerationMI, avatarMCMI;
 
     // Other
-    JButton genrtlotos, genlotos, genuppaal, gendesign, genMapping, dse, dseZ3, noc;
-    JButton checkcode, simulation, validation;
-    JButton oneClickrtlotos, onclicklotos, gensystemc, simusystemc, gentml, genC, genjava, nc,externalSearch, internalSearch;
+    private JButton genrtlotos, genlotos, genuppaal, gendesign, genMapping, dse, dseZ3, noc;
+    private JMenuItem genrtlotosMI, genlotosMI, genuppaalMI, gendesignMI, genMappingMI, dseMI, dseZ3MI, nocMI;
+    private JButton checkcode, simulation, validation;
+    private JMenuItem checkcodeMI, simulationMI, validationMI;
+
+    private JButton oneClickrtlotos, onclicklotos, gensystemc, simusystemc, gentml, genC, genjava, nc,externalSearch, internalSearch;
+    private JMenuItem oneClickrtlotosMI, onclicklotosMI, gensystemcMI, simusystemcMI, gentmlMI, genCMI, genjavaMI, ncMI;
+
+    // Main button
+    private JButton menuButton;
+    private JPopupMenu menu;
+
+    private boolean popupShown;
+
 
     private JTextField search;
 
-    MainGUI mgui;
+    private MainGUI mgui;
 
     public JToolBarMainTurtle(MainGUI _mgui) {
         super();
@@ -81,130 +104,140 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
     // Menus
     private void buildToolBar(MainGUI mgui) {
         JButton button;
+        MenuItem m;
 
-        button = add(mgui.actions[TGUIAction.ACT_NEW]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_NEW_PROJECT]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_OPEN]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_OPEN_PROJECT]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_SAVE]);
-        button.addMouseListener(mgui.mouseHandler);
-        //button = add(mgui.actions[TGUIAction.ACT_SAVE_AS]);
-        //button.addMouseListener(mgui.mouseHandler);
-
-        addSeparator();
-
-        button = add(mgui.actions[TGUIAction.ACT_IMPORT_LIB]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_EXPORT_LIB]);
-        button.addMouseListener(mgui.mouseHandler);
+        menu = new JPopupMenu();
 
-        addSeparator();
+        menu.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                popupShown = true;
+            }
 
-        button = add(mgui.actions[TGUIAction.ACT_CUT]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_COPY]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_PASTE]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_DELETE]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.MOVE_ENABLED]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.FIRST_DIAGRAM]);
-        button.addMouseListener(mgui.mouseHandler);
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                SwingUtilities.invokeLater(new Runnable() {
 
-        addSeparator();
-
-        button = add(mgui.actions[TGUIAction.ACT_BACKWARD]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_FORWARD]);
-        button.addMouseListener(mgui.mouseHandler);
+                    @Override
+                    public void run() {
+                        popupShown = false;
+                    }
+                });
+            }
 
-        addSeparator();
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+            }
+        });
+
+        menuButton = add(mgui.actions[TGUIAction.ACT_ACTION_MENU]);
+        menuButton.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mousePressed(MouseEvent e) {
+                final boolean shown = popupShown;
+                SwingUtilities.invokeLater(new Runnable() {
+
+                    @Override
+                    public void run() {
+                        popupShown = shown;
+                    }
+                });
+            }
+        });
 
-        button = add(mgui.actions[TGUIAction.ACT_ZOOM_LESS]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_SHOW_ZOOM]);
-        button.addMouseListener(mgui.mouseHandler);
-        button = add(mgui.actions[TGUIAction.ACT_ZOOM_MORE]);
-        button.addMouseListener(mgui.mouseHandler);
-        //button.setMinimumSize(button.getSize());
 
         addSeparator();
 
-        /*button = add(mgui.actions[TGUIAction.ACT_FIRST_DIAG]);
-          button.addMouseListener(mgui.mouseHandler);
-          button = add(mgui.actions[TGUIAction.ACT_BACK_DIAG]);
-          button.addMouseListener(mgui.mouseHandler);
-          button = add(mgui.actions[TGUIAction.ACT_NEXT_DIAG]);
-          button.addMouseListener(mgui.mouseHandler);
-          button = add(mgui.actions[TGUIAction.ACT_LAST_DIAG]);
-          button.addMouseListener(mgui.mouseHandler);*/
+        int j;
+        for (j=0; j<COMMON_ACTIONS.length; j++) {
+            if (COMMON_ACTIONS[j] == -1) {
+                addSeparator();
+                menu.addSeparator();
+            } else {
+                button = add(mgui.actions[COMMON_ACTIONS[j]]);
+                button.addMouseListener(mgui.mouseHandler);
+                addMenu(mgui.actions[COMMON_ACTIONS[j]]);
+            }
+        }
 
-        addSeparator();
-        addSeparator();
 
-        button = add(mgui.actions[TGUIAction.ACT_MODEL_CHECKING]);
-        button.addMouseListener(mgui.mouseHandler);
         addSeparator();
+        menu.addSeparator();
 
         if (MainGUI.experimentalOn) {
             gendesign = add(mgui.actions[TGUIAction.ACT_GEN_DESIGN]);
             gendesign.addMouseListener(mgui.mouseHandler);
+            gendesignMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_DESIGN]);
         }
 
         addSeparator();
+        menu.addSeparator();
 
         avatarSimu = add(mgui.actions[TGUIAction.ACT_AVATAR_SIM]);
         avatarSimu.addMouseListener(mgui.mouseHandler);
+        avatarSimuMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_SIM]);
 
         genMapping = add(mgui.actions[TGUIAction.ACT_GEN_MAPPING]);
         genMapping.addMouseListener(mgui.mouseHandler);
+        genMappingMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_MAPPING]);
 
         dse = add(mgui.actions[TGUIAction.ACT_DSE]);
         dse.addMouseListener(mgui.mouseHandler);
+        dseMI = addMenu(mgui.actions[TGUIAction.ACT_DSE]);
 
         if (MainGUI.experimentalOn) {
             dseZ3 = add(mgui.actions[TGUIAction.ACT_DSE_Z3]);
             dseZ3.addMouseListener(mgui.mouseHandler);
+            dseZ3MI = addMenu(mgui.actions[TGUIAction.ACT_DSE_Z3]);
         }
 
         addSeparator();
+        menu.addSeparator();
+
 
-        //if (MainGUI.experimentalOn) {
         avatarMC = add(mgui.actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER]);
         avatarMC.addMouseListener(mgui.mouseHandler);
-        //}
+        avatarMCMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_MODEL_CHECKER]);
+
         avatarFVUPPAAL = add(mgui.actions[TGUIAction.ACT_AVATAR_FV_UPPAAL]);
         avatarFVUPPAAL.addMouseListener(mgui.mouseHandler);
+        avatarFVUPPAALMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_FV_UPPAAL]);
+
         if (MainGUI.uppaalOn) {
             genuppaal = add(mgui.actions[TGUIAction.ACT_GEN_UPPAAL]);
             genuppaal.addMouseListener(mgui.mouseHandler);
+            genuppaalMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_UPPAAL]);
         }
+
         if (MainGUI.proverifOn) {
             avatarFVProVerif = add(mgui.actions[TGUIAction.ACT_AVATAR_FV_PROVERIF]);
             avatarFVProVerif.addMouseListener(mgui.mouseHandler);
+            avatarFVProVerifMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_FV_PROVERIF]);
         }
 
         avatarFVStaticAnalysis = add(mgui.actions[TGUIAction.ACT_AVATAR_FV_STATICANALYSIS]);
         avatarFVStaticAnalysis.addMouseListener(mgui.mouseHandler);
+        avatarFVStaticAnalysisMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_FV_STATICANALYSIS]);
+
 
         addSeparator();
+        menu.addSeparator();
 
         avatarCodeGeneration = add(mgui.actions[TGUIAction.ACT_AVATAR_EXECUTABLE_GENERATION]);
         avatarCodeGeneration.addMouseListener(mgui.mouseHandler);
+        avatarCodeGenerationMI = addMenu(mgui.actions[TGUIAction.ACT_AVATAR_EXECUTABLE_GENERATION]);
 
         addSeparator();
+        menu.addSeparator();
 
         genrtlotos = add(mgui.actions[TGUIAction.ACT_GEN_RTLOTOS]);
         genrtlotos.addMouseListener(mgui.mouseHandler);
+        genrtlotosMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_RTLOTOS]);
+
         if (MainGUI.systemcOn) {
             genlotos = add(mgui.actions[TGUIAction.ACT_GEN_LOTOS]);
             genlotos.addMouseListener(mgui.mouseHandler);
+            genlotosMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_LOTOS]);
             /*addSeparator();
               button = add(mgui.actions[TGUIAction.ACT_GEN_AUTS]);
               button.addMouseListener(mgui.mouseHandler);
@@ -213,49 +246,70 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
         } else if (MainGUI.lotosOn) {
             genlotos = add(mgui.actions[TGUIAction.ACT_GEN_LOTOS]);
             genlotos.addMouseListener(mgui.mouseHandler);
+            genlotosMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_LOTOS]);
         }
 
         addSeparator();
+        menu.addSeparator();
 
         checkcode = add(mgui.actions[TGUIAction.ACT_CHECKCODE]);
         checkcode.addMouseListener(mgui.mouseHandler);
+        checkcodeMI = addMenu(mgui.actions[TGUIAction.ACT_CHECKCODE]);
+
         simulation = add(mgui.actions[TGUIAction.ACT_SIMULATION]);
         simulation.addMouseListener(mgui.mouseHandler);
+        simulationMI = addMenu(mgui.actions[TGUIAction.ACT_SIMULATION]);
+
         validation = add(mgui.actions[TGUIAction.ACT_VALIDATION]);
         validation.addMouseListener(mgui.mouseHandler);
+        validationMI = addMenu(mgui.actions[TGUIAction.ACT_VALIDATION]);
 
         addSeparator();
+        menu.addSeparator();
 
         oneClickrtlotos = add(mgui.actions[TGUIAction.ACT_ONECLICK_RTLOTOS_RG]);
         oneClickrtlotos.addMouseListener(mgui.mouseHandler);
+        oneClickrtlotosMI = addMenu(mgui.actions[TGUIAction.ACT_ONECLICK_RTLOTOS_RG]);
+
         if (MainGUI.lotosOn) {
             onclicklotos = add(mgui.actions[TGUIAction.ACT_ONECLICK_LOTOS_RG]);
             onclicklotos.addMouseListener(mgui.mouseHandler);
+            onclicklotosMI = addMenu(mgui.actions[TGUIAction.ACT_ONECLICK_LOTOS_RG]);
         }
 
         addSeparator();
+        menu.addSeparator();
 
         if (MainGUI.systemcOn) {
             gensystemc = add(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
             gensystemc.addMouseListener(mgui.mouseHandler);
+            gensystemcMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
 
             simusystemc = add(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
             simusystemc.addMouseListener(mgui.mouseHandler);
+            simusystemcMI = addMenu(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
             addSeparator();
+            menu.addSeparator();
 
             gentml = add(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
             gentml.addMouseListener(mgui.mouseHandler);
+            gentmlMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
             addSeparator();
+            menu.addSeparator();
 
             genC = add(mgui.actions[TGUIAction.ACT_GEN_CCODE]);
             genC.addMouseListener(mgui.mouseHandler);
+            genCMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_CCODE]);
             addSeparator();
+            menu.addSeparator();
         }
 
         addSeparator();
+        menu.addSeparator();
 
         genjava = add(mgui.actions[TGUIAction.ACT_GEN_JAVA]);
         genjava.addMouseListener(mgui.mouseHandler);
+        genjavaMI = addMenu(mgui.actions[TGUIAction.ACT_GEN_JAVA]);
         //button = add(mgui.actions[TGUIAction.ACT_SIMU_JAVA]);
         //button.addMouseListener(mgui.mouseHandler);
 
@@ -264,11 +318,13 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
         if (MainGUI.experimentalOn) {
             noc = add(mgui.actions[TGUIAction.ACT_REMOVENOC]);
             noc.addMouseListener(mgui.mouseHandler);
+            nocMI = addMenu(mgui.actions[TGUIAction.ACT_REMOVENOC]);
         }
 
         if (MainGUI.ncOn) {
             nc = add(mgui.actions[TGUIAction.ACT_NC]);
             nc.addMouseListener(mgui.mouseHandler);
+            ncMI = addMenu(mgui.actions[TGUIAction.ACT_NC]);
         }
 
         addSeparator();
@@ -278,6 +334,8 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
             button = add(mgui.actions[TGUIAction.EXTERNAL_ACTION_1]);
             button.addMouseListener(mgui.mouseHandler);
             button.setToolTipText(ConfigurationTTool.ExternalCommand1);
+            JMenuItem mi = addMenu(mgui.actions[TGUIAction.EXTERNAL_ACTION_1]);
+            mi.setToolTipText(ConfigurationTTool.ExternalCommand1);
             addSeparator();
         }
 
@@ -285,7 +343,10 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
             button = add(mgui.actions[TGUIAction.EXTERNAL_ACTION_2]);
             button.addMouseListener(mgui.mouseHandler);
             button.setToolTipText(ConfigurationTTool.ExternalCommand2);
+            JMenuItem mi = addMenu(mgui.actions[TGUIAction.EXTERNAL_ACTION_2]);
+            mi.setToolTipText(ConfigurationTTool.ExternalCommand2);
             addSeparator();
+            menu.addSeparator();
         }
 
         addSeparator();
@@ -301,7 +362,7 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
                 public void insertUpdate(DocumentEvent documentEvent) {
                     if ( search.getText().length()>0){
                         internalSearch.setEnabled(true);
-                    }else
+                    } else
                         internalSearch.setEnabled(false);
                 }
 
@@ -309,7 +370,7 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
                 public void removeUpdate(DocumentEvent documentEvent) {
                     if ( search.getText().length()>0){
                         internalSearch.setEnabled(true);
-                    }else
+                    } else
                         internalSearch.setEnabled(false);
                 }
 
@@ -330,72 +391,135 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
 
         //TraceManager.addDev("Show avatar options with b = " + b);
         genMapping.setVisible(!b);
+        genMappingMI.setVisible(!b);
         dse.setVisible(!b);
+        dseMI.setVisible(!b);
+
         if (dseZ3 != null) {
             dseZ3.setVisible(!b);
         }
+        if (dseZ3MI != null) {
+            dseZ3MI.setVisible(!b);
+        }
 
         if (noc != null) {
             noc.setVisible(!b);
+            nocMI.setVisible(!b);
         }
 
         avatarSimu.setVisible(b);
         avatarFVUPPAAL.setVisible(b);
+        avatarSimuMI.setVisible(b);
+        avatarFVUPPAALMI.setVisible(b);
+
         if (avatarFVProVerif != null) {
             avatarFVProVerif.setVisible(b);
         }
-        //avatarFVStaticAnalysis.setVisible(b);
+        if (avatarFVProVerifMI != null) {
+            avatarFVProVerifMI.setVisible(b);
+        }
+
+
         avatarFVStaticAnalysis.setVisible(b);
         avatarCodeGeneration.setVisible(b);
+        avatarFVStaticAnalysisMI.setVisible(b);
+        avatarCodeGenerationMI.setVisible(b);
 
-        if (genrtlotos != null) {
-            genrtlotos.setVisible(!b);
+        if (genrtlotosMI != null) {
+            genrtlotosMI.setVisible(!b);
         }
 
         if (genlotos != null) {
             genlotos.setVisible(!b);
         }
+        if (genlotosMI != null) {
+            genlotosMI.setVisible(!b);
+        }
 
         if (genuppaal != null) {
             genuppaal.setVisible(!b);
         }
 
+        if (genuppaalMI != null) {
+            genuppaalMI.setVisible(!b);
+        }
+
         if (checkcode != null) {
             checkcode.setVisible(!b);
         }
 
+        if (checkcodeMI != null) {
+            checkcodeMI.setVisible(!b);
+        }
+
         if (simulation != null) {
             simulation.setVisible(!b);
         }
 
+        if (simulationMI != null) {
+            simulationMI.setVisible(!b);
+        }
+
         if (validation != null) {
             validation.setVisible(!b);
         }
 
+        if (validationMI != null) {
+            validationMI.setVisible(!b);
+        }
+
         if (oneClickrtlotos != null) {
             oneClickrtlotos.setVisible(!b);
         }
 
+        if (oneClickrtlotosMI != null) {
+            oneClickrtlotosMI.setVisible(!b);
+        }
+
         if (onclicklotos != null) {
             onclicklotos.setVisible(!b);
         }
 
+        if (onclicklotosMI != null) {
+            onclicklotosMI.setVisible(!b);
+        }
+
         if (gensystemc != null) {
             gensystemc.setVisible(!b);
         }
 
+        if (gensystemcMI != null) {
+            gensystemcMI.setVisible(!b);
+        }
+
         if (simusystemc != null) {
             simusystemc.setVisible(!b);
         }
 
+        if (simusystemcMI != null) {
+            simusystemcMI.setVisible(!b);
+        }
+
         if (gentml != null) {
             gentml.setVisible(!b);
         }
 
+        if (gentmlMI != null) {
+            gentmlMI.setVisible(!b);
+        }
+
         if (genC != null) {
             genC.setVisible(!b);
         }
 
+        if (genCMI != null) {
+            genCMI.setVisible(!b);
+        }
+
+        if (genjavaMI != null) {
+            genjavaMI.setVisible(!b);
+        }
+
         if (genjava != null) {
             genjava.setVisible(!b);
         }
@@ -404,10 +528,18 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
             nc.setVisible(!b);
         }
 
+        if (ncMI != null) {
+            ncMI.setVisible(!b);
+        }
+
         if (gendesign != null) {
             gendesign.setVisible(!b);
         }
 
+        if (gendesignMI != null) {
+            gendesignMI.setVisible(!b);
+        }
+
     }
 
     public void showDiplodocusActions(boolean b) {
@@ -416,80 +548,119 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
 
         genMapping.setVisible(b);
         dse.setVisible(b);
+
+        genMappingMI.setVisible(b);
+        dseMI.setVisible(b);
+
         if (dseZ3 != null) {
             dseZ3.setVisible(b);
         }
 
+        if (dseZ3MI != null) {
+            dseZ3MI.setVisible(b);
+        }
+
         if (noc != null) {
             noc.setVisible(b);
         }
 
+        if (nocMI != null) {
+            nocMI.setVisible(b);
+        }
+
         avatarSimu.setVisible(!b);
         avatarFVUPPAAL.setVisible(!b);
         avatarFVStaticAnalysis.setVisible(!b);
+
+        avatarSimuMI.setVisible(!b);
+        avatarFVUPPAALMI.setVisible(!b);
+        avatarFVStaticAnalysisMI.setVisible(!b);
+
         if (avatarFVProVerif != null) {
             avatarFVProVerif.setVisible(b);
         }
+
+        if (avatarFVProVerifMI != null) {
+            avatarFVProVerifMI.setVisible(b);
+        }
+
         avatarCodeGeneration.setVisible(!b);
+        avatarCodeGenerationMI.setVisible(!b);
 
         if (genrtlotos != null) {
             genrtlotos.setVisible(!b);
+            genrtlotosMI.setVisible(!b);
         }
 
+
         if (genlotos != null) {
             genlotos.setVisible(!b);
+            genlotosMI.setVisible(!b);
         }
 
         if (genuppaal != null) {
             genuppaal.setVisible(b);
+            genuppaalMI.setVisible(b);
         }
 
         if (checkcode != null) {
             checkcode.setVisible(!b);
+            checkcodeMI.setVisible(!b);
         }
 
         if (simulation != null) {
             simulation.setVisible(!b);
+            simulationMI.setVisible(!b);
         }
 
         if (validation != null) {
             validation.setVisible(!b);
+            validationMI.setVisible(!b);
         }
 
         if (oneClickrtlotos != null) {
             oneClickrtlotos.setVisible(!b);
+            oneClickrtlotosMI.setVisible(!b);
         }
 
         if (onclicklotos != null) {
             onclicklotos.setVisible(!b);
+            onclicklotosMI.setVisible(!b);
         }
 
         if (gensystemc != null) {
             gensystemc.setVisible(b);
+            gensystemcMI.setVisible(b);
         }
 
         if (simusystemc != null) {
             simusystemc.setVisible(b);
+            simusystemcMI.setVisible(b);
         }
 
         if (gentml != null) {
             gentml.setVisible(b);
+            gentmlMI.setVisible(b);
         }
 
         if (genC != null) {
             genC.setVisible(b);
+            genCMI.setVisible(b);
         }
 
         if (genjava != null) {
             genjava.setVisible(!b);
+            genjavaMI.setVisible(!b);
         }
 
         if (nc != null) {
             nc.setVisible(!b);
+            ncMI.setVisible(!b);
         }
 
         if (gendesign != null) {
             gendesign.setVisible(!b);
+            gendesignMI.setVisible(!b);
         }
 
     }
@@ -517,12 +688,33 @@ public  class JToolBarMainTurtle extends JToolBar implements ActionListener
     public void setSearchText( final String text ) {
     	search.setText( text );
     }
-//
-//	public JTextField getSearch() {
-//		return search;
-//	}
-//
-//	public void setSearch(JTextField search) {
-//		this.search = search;
-//	}
+
+    public void popupMainCommand() {
+        if (popupShown) {
+            menu.setVisible(false);
+            popupShown = false;
+            return;
+        }
+
+        // Get the location of the point 'on the screen'
+        Point p = menuButton.getLocationOnScreen();
+        menu.show(this,0,0);
+        menu.setLocation(p.x,p.y + menuButton.getHeight());
+    }
+
+    private JMenuItem addMenu(TGUIAction action) {
+        JMenuItem mi = new JMenuItem(action);
+        addMenuItem(mi, action);
+        return mi;
+    }
+
+    private void addMenuItem(JMenuItem mi, TGUIAction action) {
+        mi.setName(action.getShortDescription());
+        menu.add(mi);
+    }
+
+
+
+
+
 } // Class
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index fa1360aca1736aa924cbd8e8304d2f7016be9b08..5011fa2162893c46e2e333ea039cbe5852ce6472 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -8949,6 +8949,11 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
         return statusMap;
     }
 
+    public void popupMainCommand() {
+        mainBar.popupMainCommand();
+    }
+
+
     public String getStatus(String s) {
         if (statusMap == null) {
             return null;
diff --git a/src/main/java/ui/ModeManager.java b/src/main/java/ui/ModeManager.java
index f23c934d1568f37fcb67ceb3eb550ed7e5a363b3..91b4695e8ab817b574a2ad9612e0a46d96094f58 100644
--- a/src/main/java/ui/ModeManager.java
+++ b/src/main/java/ui/ModeManager.java
@@ -59,6 +59,7 @@ public class ModeManager {
             break;
         case MainGUI.NOT_OPENED:
             mgui.activeActions(false);
+            actions[TGUIAction.ACT_ACTION_MENU].setEnabled(true);
             actions[TGUIAction.ACT_NEW].setEnabled(true);
             actions[TGUIAction.ACT_NEW_PROJECT].setEnabled(true);
             actions[TGUIAction.ACT_OPEN].setEnabled(true);
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 3a47bf62e955542e88e357ad9b89987bba3b75db..21f809883af136fd4f7ebabfa2042d75121e14a8 100644
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -61,6 +61,8 @@ public class TGUIAction extends AbstractAction {
     private static final long serialVersionUID = -4942930048930203001L;
 
     // Actions
+    public static final int ACT_ACTION_MENU = 531;
+
     public static final int ACT_NEW = 0;
     public static final int ACT_NEW_PROJECT = 471;
     public static final int ACT_NEW_DESIGN = 100;
@@ -686,7 +688,7 @@ public class TGUIAction extends AbstractAction {
 
     public static final int MOVE_ENABLED = 463;
     public static final int FIRST_DIAGRAM = 464;   
-    public static final int NB_ACTION = 531;
+    public static final int NB_ACTION = 532;
 
     private static final TAction [] actions = new TAction[NB_ACTION];
 
@@ -786,6 +788,10 @@ public class TGUIAction extends AbstractAction {
     }
 
     public void init() {
+
+        actions[ACT_ACTION_MENU] = new TAction("action-menu", "Main actions", IconManager.imgic2, IconManager.imgic2, "Main Actions" , "Main " +
+                "Actions", 'M');
+
         actions[ACT_NEW] = new TAction("new-command", "New Model", IconManager.imgic20, IconManager.imgic21, "New Model" , "New model", 'N');
         actions[ACT_NEW_PROJECT] = new TAction("new-project-command", "New project", IconManager.imgic20_proj, IconManager.imgic21_proj, "New project", "New project", 0);
         actions[ACT_NEW_DESIGN] = new TAction("new-command-design", "New design", IconManager.imgic14, IconManager.imgic14, "New design", "New TURTLE design", 0);
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index 68b8a5bdf74286beab79d4535fd70b514f6c9bdd..6b00501bd87b50afea74180bc664a7e8f114879a 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -55,7 +55,7 @@ public class IconManager {
 
     public static ImageIcon imgic8, imgic9;
     //Added by Solange
-    public static ImageIcon imgic0, imgic1;
+    public static ImageIcon imgic0, imgic1, imgic2;
     public static Image img8, img9;
     public static Image img5072, img5100, img5102, img5200;
     //Added by Solange
@@ -195,7 +195,9 @@ public class IconManager {
     private static String ttoolStringIcon = "starting_logo.gif";
     public static ImageIcon ttoolImageIcon;
     public static Image ttoolImage;
-    
+
+    private static String icon2 = "menu.gif";
+
     private static String icon8 = "turtle_16.gif";
     private static String icon9 = "diplodocus2_16.gif";
 
@@ -776,6 +778,8 @@ public class IconManager {
         	img1 = imgic1.getImage();
         }
 
+        imgic2 = getIcon(icon2);
+
         imgic13 = getIcon(icon13);
         imgic14 = getIcon(icon14);
         imgic15 = getIcon(icon15);
diff --git a/src/main/resources/ui/util/menu.gif b/src/main/resources/ui/util/menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43d6713ce9e8feee01a95d0800a5c01d6131a831
Binary files /dev/null and b/src/main/resources/ui/util/menu.gif differ