diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml
index 29ce13aba77f06a7d14932696a31beb61d2839f8..9e2342e64729a5e3f4198b51cc855824c50096f4 100755
--- a/modeling/DIPLODOCUS/SmartCardProtocol.xml
+++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml
@@ -8,112 +8,112 @@
 <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="402" y="84" id="36" />
-<P2  x="593" y="85" id="166" />
+<P1  x="402" y="84" id="48" />
+<P2  x="593" y="85" id="81" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="2" >
 <cdparam x="652" y="444" />
 <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="805" y="544" id="69" />
-<P2  x="971" y="481" id="132" />
+<P1  x="805" y="544" id="178" />
+<P2  x="971" y="481" id="106" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="3" >
 <cdparam x="652" y="418" />
 <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="805" y="512" id="67" />
-<P2  x="932" y="472" id="134" />
+<P1  x="805" y="512" id="180" />
+<P2  x="932" y="472" id="104" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="4" >
 <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="752" y="408" id="59" />
-<P2  x="844" y="363" id="83" />
+<P1  x="752" y="408" id="188" />
+<P2  x="844" y="363" id="149" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="5" >
 <cdparam x="685" y="310" />
 <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="844" y="389" id="87" />
-<P2  x="932" y="358" id="124" />
+<P1  x="844" y="389" id="153" />
+<P2  x="932" y="358" id="114" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="6" >
 <cdparam x="652" y="395" />
 <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="805" y="483" id="63" />
-<P2  x="932" y="449" id="126" />
+<P1  x="805" y="483" id="184" />
+<P2  x="932" y="449" id="112" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="7" >
 <cdparam x="652" y="369" />
 <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="805" y="451" id="65" />
-<P2  x="932" y="422" id="128" />
+<P1  x="805" y="451" id="182" />
+<P2  x="932" y="422" id="110" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="8" >
 <cdparam x="737" y="314" />
 <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="932" y="393" id="130" />
-<P2  x="805" y="422" id="61" />
+<P1  x="932" y="393" id="108" />
+<P2  x="805" y="422" id="186" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="9" >
 <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="932" y="323" id="122" />
-<P2  x="736" y="271" id="178" />
+<P1  x="932" y="323" id="116" />
+<P2  x="736" y="271" id="69" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="10" >
 <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="736" y="235" id="180" />
-<P2  x="932" y="284" id="120" />
+<P1  x="736" y="235" id="67" />
+<P2  x="932" y="284" id="118" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="11" >
 <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="736" y="191" id="182" />
-<P2  x="932" y="241" id="118" />
+<P1  x="736" y="191" id="65" />
+<P2  x="932" y="241" id="120" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="12" >
 <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="844" y="363" id="82" />
-<P2  x="736" y="302" id="184" />
+<P1  x="844" y="363" id="148" />
+<P2  x="736" y="302" id="63" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="13" >
 <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="535" y="291" id="174" />
-<P2  x="455" y="291" id="44" />
+<P1  x="535" y="291" id="73" />
+<P2  x="455" y="291" id="40" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="14" >
 <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="455" y="117" id="48" />
-<P2  x="535" y="117" id="186" />
+<P1  x="455" y="117" id="36" />
+<P2  x="535" y="117" id="61" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="15" >
@@ -121,71 +121,71 @@
 <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="455" y="203" id="42" />
-<P2  x="535" y="203" id="172" />
+<P2  x="535" y="203" id="75" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="16" >
 <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="535" y="248" id="170" />
-<P2  x="455" y="248" id="40" />
+<P1  x="535" y="248" id="77" />
+<P2  x="455" y="248" id="44" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="17" >
 <cdparam x="460" 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="536" y="323" id="168" />
-<P2  x="455" y="323" id="38" />
+<P1  x="536" y="323" id="79" />
+<P2  x="455" y="323" id="46" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="18" >
 <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="455" y="157" id="46" />
-<P2  x="535" y="157" id="176" />
+<P1  x="455" y="157" id="38" />
+<P2  x="535" y="157" id="71" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="19" >
 <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="932" y="191" id="116" />
-<P2  x="736" y="112" id="164" />
+<P1  x="932" y="191" id="122" />
+<P2  x="736" y="112" id="83" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="20" >
 <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="326" id="188" />
-<P2  x="671" y="408" id="71" />
+<P1  x="630" y="326" id="59" />
+<P2  x="671" y="408" id="176" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="21" >
 <cdparam x="1304" y="321" />
 <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="1234" y="369" id="101" />
-<P2  x="1169" y="376" id="136" />
+<P1  x="1234" y="369" id="137" />
+<P2  x="1169" y="376" id="102" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="22" >
 <cdparam x="1168" y="455" />
 <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="1169" y="411" id="138" />
-<P2  x="1234" y="404" id="103" />
+<P1  x="1169" y="411" id="100" />
+<P2  x="1234" y="404" id="135" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="126" id="25" >
 <cdparam x="1037" y="180" />
 <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="1169" y="204" id="140" />
-<P2  x="1169" y="272" id="142" />
+<P1  x="1169" y="204" id="98" />
+<P2  x="1169" y="272" id="96" />
 <Point x="1224" y="226" />
 <Point x="1224" y="266" />
 <AutomaticDrawing  data="true" />
@@ -210,8 +210,8 @@
 <cdparam x="873" y="361" />
 <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="1169" y="451" id="144" />
-<P2  x="1234" y="432" id="105" />
+<P1  x="1169" y="451" id="94" />
+<P2  x="1234" y="432" id="133" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <COMPONENT type="1205" id="35" >
@@ -249,6 +249,7 @@
 <TGConnectingPoint num="6" id="56" />
 <TGConnectingPoint num="7" id="57" />
 <extraparam>
+<Data isAttacker="No" />
 <Attribute access="2" id="resetType" value="0" type="0" typeOther="" />
 <Attribute access="2" id="x" value="0" type="0" typeOther="" />
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
@@ -258,14 +259,14 @@
 </COMPONENT>
 <SUBCOMPONENT type="1203" id="37" >
 <father id="58" num="0" />
-<cdparam x="389" y="84" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="445" y="117" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
-<infoparam name="TGComponent" value="Event reset, pTS" />
+<cdrectangleparam minX="-10" maxX="281" minY="-10" maxY="267" />
+<infoparam name="TGComponent" value="Request activation" />
 <TGConnectingPoint num="0" id="36" />
 <extraparam>
-<Prop commName="reset, pTS" 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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -275,16 +276,16 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="39" >
 <father id="58" num="1" />
-<cdparam x="442" y="323" />
+<cdparam x="442" y="157" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<infoparam name="TGComponent" value="Event data_Ready" />
 <TGConnectingPoint num="0" id="38" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<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" referenceReq="" />
+<Type type="1" typeOther="" />
+<Type type="2" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -292,14 +293,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="41" >
 <father id="58" num="2" />
-<cdparam x="442" y="248" />
+<cdparam x="442" y="291" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
 <TGConnectingPoint num="0" id="40" />
 <extraparam>
-<Prop commName="fromSCtoD" 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" />
+<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -316,7 +317,7 @@
 <infoparam name="TGComponent" value="Channel fromDtoSC" />
 <TGConnectingPoint num="0" id="42" />
 <extraparam>
-<Prop commName="fromDtoSC" 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" />
+<Prop commName="fromDtoSC" 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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -326,14 +327,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="45" >
 <father id="58" num="4" />
-<cdparam x="442" y="291" />
+<cdparam x="442" y="248" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
 <TGConnectingPoint num="0" id="44" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="fromSCtoD" 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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -343,16 +344,16 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="47" >
 <father id="58" num="5" />
-<cdparam x="442" y="157" />
+<cdparam x="442" y="323" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
 <TGConnectingPoint num="0" id="46" />
 <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" />
-<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -360,14 +361,14 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="49" >
 <father id="58" num="6" />
-<cdparam x="445" y="117" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="389" 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="281" minY="-10" maxY="267" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-13" maxX="278" minY="-13" maxY="264" />
+<infoparam name="TGComponent" value="Event reset, pTS" />
 <TGConnectingPoint num="0" id="48" />
 <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" />
+<Prop commName="reset, pTS" 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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -394,34 +395,43 @@
 <info hiddeni="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1202" id="81" >
+<SUBCOMPONENT type="1202" id="93" >
 <father id="207" num="0" />
-<cdparam x="565" y="418" />
-<sizeparam width="240" height="146" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="535" y="98" />
+<sizeparam width="201" height="238" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="696" minY="0" maxY="384" />
-<infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="73" />
-<TGConnectingPoint num="1" id="74" />
-<TGConnectingPoint num="2" id="75" />
-<TGConnectingPoint num="3" id="76" />
-<TGConnectingPoint num="4" id="77" />
-<TGConnectingPoint num="5" id="78" />
-<TGConnectingPoint num="6" id="79" />
-<TGConnectingPoint num="7" id="80" />
-<extraparam>
+<cdrectangleparam minX="0" maxX="735" minY="0" maxY="292" />
+<infoparam name="TGComponent" value="SmartCard" />
+<TGConnectingPoint num="0" id="85" />
+<TGConnectingPoint num="1" id="86" />
+<TGConnectingPoint num="2" id="87" />
+<TGConnectingPoint num="3" id="88" />
+<TGConnectingPoint num="4" id="89" />
+<TGConnectingPoint num="5" id="90" />
+<TGConnectingPoint num="6" id="91" />
+<TGConnectingPoint num="7" id="92" />
+<extraparam>
+<Data isAttacker="No" />
+<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="60" >
-<father id="81" num="0" />
-<cdparam x="742" y="408" />
+<father id="93" num="0" />
+<cdparam x="620" y="326" />
 <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="136" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<cdrectangleparam minX="-10" maxX="191" minY="-10" maxY="228" />
+<infoparam name="TGComponent" value="Request start_Application" />
 <TGConnectingPoint num="0" id="59" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -430,15 +440,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="62" >
-<father id="81" num="1" />
-<cdparam x="795" y="422" />
+<father id="93" num="1" />
+<cdparam x="525" y="117" />
 <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="136" />
-<infoparam name="TGComponent" value="Channel fromTtoA" />
+<cdrectangleparam minX="-10" maxX="191" minY="-10" maxY="228" />
+<infoparam name="TGComponent" value="Request activation" />
 <TGConnectingPoint num="0" id="61" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -447,15 +457,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="64" >
-<father id="81" num="2" />
-<cdparam x="795" y="483" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="93" num="2" />
+<cdparam x="723" y="302" />
+<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="136" />
-<infoparam name="TGComponent" value="Event send_TCP" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
 <TGConnectingPoint num="0" id="63" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -464,15 +474,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="66" >
-<father id="81" num="3" />
-<cdparam x="795" y="451" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="93" num="3" />
+<cdparam x="723" y="191" />
+<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="136" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event receive" />
 <TGConnectingPoint num="0" id="65" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -481,15 +491,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="68" >
-<father id="81" num="4" />
-<cdparam x="795" y="512" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="93" num="4" />
+<cdparam x="723" 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="230" minY="-10" maxY="136" />
-<infoparam name="TGComponent" value="Event receive_Application" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
 <TGConnectingPoint num="0" id="67" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -498,15 +508,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="70" >
-<father id="81" num="5" />
-<cdparam x="795" y="544" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="93" num="5" />
+<cdparam x="723" y="271" />
+<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="136" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
 <TGConnectingPoint num="0" id="69" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -515,15 +525,32 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="72" >
-<father id="81" num="6" />
-<cdparam x="661" y="408" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="93" num="6" />
+<cdparam x="522" y="157" />
+<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="136" />
-<infoparam name="TGComponent" value="Request start_Application" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event data_Ready" />
 <TGConnectingPoint num="0" id="71" />
 <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" />
+<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" referenceReq="" />
+<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="74" >
+<father id="93" num="7" />
+<cdparam x="522" y="291" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event data_Ready_SC" />
+<TGConnectingPoint num="0" id="73" />
+<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -531,80 +558,50 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1200" id="163" >
-<father id="207" num="1" />
-<cdparam x="844" y="134" />
-<sizeparam width="570" height="486" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="76" >
+<father id="93" num="8" />
+<cdparam x="522" y="203" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="366" minY="0" maxY="44" />
-<infoparam name="TGComponent" value="TCPIP Entities" />
-<TGConnectingPoint num="0" id="155" />
-<TGConnectingPoint num="1" id="156" />
-<TGConnectingPoint num="2" id="157" />
-<TGConnectingPoint num="3" id="158" />
-<TGConnectingPoint num="4" id="159" />
-<TGConnectingPoint num="5" id="160" />
-<TGConnectingPoint num="6" id="161" />
-<TGConnectingPoint num="7" id="162" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Channel fromDtoSC" />
+<TGConnectingPoint num="0" id="75" />
 <extraparam>
-<info hiddeni="false" />
+<Prop commName="fromDtoSC" commType="0" 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" referenceReq="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1201" id="100" >
-<father id="163" num="0" />
-<cdparam x="831" y="363" />
-<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="473" />
-<infoparam name="Composite port" value="" />
-<TGConnectingPoint num="0" id="82" />
-<TGConnectingPoint num="1" id="83" />
-<TGConnectingPoint num="2" id="84" />
-<TGConnectingPoint num="3" id="85" />
-<TGConnectingPoint num="4" id="86" />
-<TGConnectingPoint num="5" id="87" />
-<TGConnectingPoint num="6" id="88" />
-<TGConnectingPoint num="7" id="89" />
-<TGConnectingPoint num="8" id="90" />
-<TGConnectingPoint num="9" id="91" />
-<TGConnectingPoint num="10" id="92" />
-<TGConnectingPoint num="11" id="93" />
-<TGConnectingPoint num="12" id="94" />
-<TGConnectingPoint num="13" id="95" />
-<TGConnectingPoint num="14" id="96" />
-<TGConnectingPoint num="15" id="97" />
-<TGConnectingPoint num="16" id="98" />
-<TGConnectingPoint num="17" id="99" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="115" >
-<father id="163" num="1" />
-<cdparam x="1234" y="329" />
-<sizeparam width="141" height="142" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="78" >
+<father id="93" num="9" />
+<cdparam x="522" y="248" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="429" minY="0" maxY="344" />
-<infoparam name="TGComponent" value="Timer" />
-<TGConnectingPoint num="0" id="107" />
-<TGConnectingPoint num="1" id="108" />
-<TGConnectingPoint num="2" id="109" />
-<TGConnectingPoint num="3" id="110" />
-<TGConnectingPoint num="4" id="111" />
-<TGConnectingPoint num="5" id="112" />
-<TGConnectingPoint num="6" id="113" />
-<TGConnectingPoint num="7" id="114" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Channel fromSCtoD" />
+<TGConnectingPoint num="0" id="77" />
 <extraparam>
-<Attribute access="2" id="x" value="0" type="0" typeOther="" />
+<Prop commName="fromSCtoD" 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" referenceReq="" />
+<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="102" >
-<father id="115" num="0" />
-<cdparam x="1224" y="369" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="80" >
+<father id="93" num="10" />
+<cdparam x="523" y="323" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="101" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
+<TGConnectingPoint num="0" id="79" />
 <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" />
+<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -612,16 +609,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="104" >
-<father id="115" num="1" />
-<cdparam x="1224" y="404" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="82" >
+<father id="93" num="11" />
+<cdparam x="580" y="85" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="103" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event reset, pTS" />
+<TGConnectingPoint num="0" id="81" />
 <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" />
+<Prop commName="reset, pTS" 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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -629,16 +626,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="106" >
-<father id="115" num="2" />
-<cdparam x="1224" y="432" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="84" >
+<father id="93" num="12" />
+<cdparam x="723" y="112" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="105" />
+<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="83" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -646,22 +643,42 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="154" >
-<father id="163" num="2" />
+<SUBCOMPONENT type="1200" id="175" >
+<father id="207" num="1" />
+<cdparam x="844" y="134" />
+<sizeparam width="570" height="486" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="366" minY="0" maxY="44" />
+<infoparam name="TGComponent" value="TCPIP Entities" />
+<TGConnectingPoint num="0" id="167" />
+<TGConnectingPoint num="1" id="168" />
+<TGConnectingPoint num="2" id="169" />
+<TGConnectingPoint num="3" id="170" />
+<TGConnectingPoint num="4" id="171" />
+<TGConnectingPoint num="5" id="172" />
+<TGConnectingPoint num="6" id="173" />
+<TGConnectingPoint num="7" id="174" />
+<extraparam>
+<info hiddeni="false" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1202" id="132" >
+<father id="175" num="0" />
 <cdparam x="932" y="173" />
 <sizeparam width="237" height="318" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="333" minY="0" maxY="168" />
 <infoparam name="TGComponent" value="TCPIP" />
-<TGConnectingPoint num="0" id="146" />
-<TGConnectingPoint num="1" id="147" />
-<TGConnectingPoint num="2" id="148" />
-<TGConnectingPoint num="3" id="149" />
-<TGConnectingPoint num="4" id="150" />
-<TGConnectingPoint num="5" id="151" />
-<TGConnectingPoint num="6" id="152" />
-<TGConnectingPoint num="7" id="153" />
-<extraparam>
+<TGConnectingPoint num="0" id="124" />
+<TGConnectingPoint num="1" id="125" />
+<TGConnectingPoint num="2" id="126" />
+<TGConnectingPoint num="3" id="127" />
+<TGConnectingPoint num="4" id="128" />
+<TGConnectingPoint num="5" id="129" />
+<TGConnectingPoint num="6" id="130" />
+<TGConnectingPoint num="7" id="131" />
+<extraparam>
+<Data isAttacker="No" />
 <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="" />
@@ -671,16 +688,16 @@
 <Attribute access="2" id="tcpctrl" value="" type="5" typeOther="TCP_CTRL" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="117" >
-<father id="154" num="0" />
-<cdparam x="919" y="191" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="95" >
+<father id="132" num="0" />
+<cdparam x="1159" y="451" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="116" />
+<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="94" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -688,16 +705,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="119" >
-<father id="154" num="1" />
-<cdparam x="919" y="241" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="97" >
+<father id="132" num="1" />
+<cdparam x="1159" y="272" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
-<infoparam name="TGComponent" value="Event receive" />
-<TGConnectingPoint num="0" id="118" />
+<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="96" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -705,16 +722,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="121" >
-<father id="154" num="2" />
-<cdparam x="919" y="284" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="99" >
+<father id="132" num="2" />
+<cdparam x="1159" y="204" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
-<TGConnectingPoint num="0" id="120" />
+<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
+<infoparam name="TGComponent" value="Channel temp" />
+<TGConnectingPoint num="0" id="98" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -722,16 +739,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="123" >
-<father id="154" num="3" />
-<cdparam x="919" y="323" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="101" >
+<father id="132" num="3" />
+<cdparam x="1159" y="411" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
-<TGConnectingPoint num="0" id="122" />
+<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="100" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -739,16 +756,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="125" >
-<father id="154" num="4" />
-<cdparam x="922" y="358" />
+<SUBCOMPONENT type="1203" id="103" >
+<father id="132" num="4" />
+<cdparam x="1159" y="376" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
-<TGConnectingPoint num="0" id="124" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="102" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -756,16 +773,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="127" >
-<father id="154" num="5" />
-<cdparam x="922" y="449" />
+<SUBCOMPONENT type="1203" id="105" >
+<father id="132" num="5" />
+<cdparam x="922" y="472" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Event send_TCP" />
-<TGConnectingPoint num="0" id="126" />
+<infoparam name="TGComponent" value="Event receive_Application" />
+<TGConnectingPoint num="0" id="104" />
 <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" />
+<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -773,16 +790,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="129" >
-<father id="154" num="6" />
-<cdparam x="922" y="422" />
+<SUBCOMPONENT type="1203" id="107" >
+<father id="132" num="6" />
+<cdparam x="961" 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="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Event open, abort, close" />
-<TGConnectingPoint num="0" id="128" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
+<TGConnectingPoint num="0" id="106" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -790,16 +807,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="131" >
-<father id="154" num="7" />
+<SUBCOMPONENT type="1203" id="109" >
+<father id="132" num="7" />
 <cdparam x="922" y="393" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
 <infoparam name="TGComponent" value="Channel fromTtoA" />
-<TGConnectingPoint num="0" id="130" />
+<TGConnectingPoint num="0" id="108" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -807,16 +824,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="133" >
-<father id="154" num="8" />
-<cdparam x="961" y="481" />
+<SUBCOMPONENT type="1203" id="111" >
+<father id="132" num="8" />
+<cdparam x="922" y="422" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Channel fromAtoT" />
-<TGConnectingPoint num="0" id="132" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
+<TGConnectingPoint num="0" id="110" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -824,16 +841,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="135" >
-<father id="154" num="9" />
-<cdparam x="922" y="472" />
+<SUBCOMPONENT type="1203" id="113" >
+<father id="132" num="9" />
+<cdparam x="922" y="449" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Event receive_Application" />
-<TGConnectingPoint num="0" id="134" />
+<infoparam name="TGComponent" value="Event send_TCP" />
+<TGConnectingPoint num="0" id="112" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -841,16 +858,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="137" >
-<father id="154" num="10" />
-<cdparam x="1159" y="376" />
+<SUBCOMPONENT type="1203" id="115" >
+<father id="132" num="10" />
+<cdparam x="922" y="358" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Event timeOut" />
-<TGConnectingPoint num="0" id="136" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<TGConnectingPoint num="0" id="114" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -858,16 +875,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="139" >
-<father id="154" num="11" />
-<cdparam x="1159" y="411" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="117" >
+<father id="132" num="11" />
+<cdparam x="919" y="323" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Request req_Timer" />
-<TGConnectingPoint num="0" id="138" />
+<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
+<infoparam name="TGComponent" value="Channel fromTtoP" />
+<TGConnectingPoint num="0" id="116" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -875,16 +892,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="141" >
-<father id="154" num="12" />
-<cdparam x="1159" y="204" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="119" >
+<father id="132" num="12" />
+<cdparam x="919" y="284" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="140" />
+<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
+<infoparam name="TGComponent" value="Channel fromPtoT" />
+<TGConnectingPoint num="0" id="118" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -892,16 +909,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="143" >
-<father id="154" num="13" />
-<cdparam x="1159" y="272" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="121" >
+<father id="132" num="13" />
+<cdparam x="919" y="241" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Channel temp" />
-<TGConnectingPoint num="0" id="142" />
+<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
+<infoparam name="TGComponent" value="Event receive" />
+<TGConnectingPoint num="0" id="120" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -909,16 +926,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="145" >
-<father id="154" num="14" />
-<cdparam x="1159" y="451" />
-<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="123" >
+<father id="132" num="14" />
+<cdparam x="919" y="191" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="227" minY="-10" maxY="308" />
-<infoparam name="TGComponent" value="Event stop" />
-<TGConnectingPoint num="0" id="144" />
+<cdrectangleparam minX="-13" maxX="224" minY="-13" maxY="305" />
+<infoparam name="TGComponent" value="Event send" />
+<TGConnectingPoint num="0" id="122" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -926,59 +943,36 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1202" id="198" >
-<father id="207" num="2" />
-<cdparam x="535" y="98" />
-<sizeparam width="201" height="238" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="147" >
+<father id="175" num="1" />
+<cdparam x="1234" y="329" />
+<sizeparam width="141" height="142" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="735" minY="0" maxY="292" />
-<infoparam name="TGComponent" value="SmartCard" />
-<TGConnectingPoint num="0" id="190" />
-<TGConnectingPoint num="1" id="191" />
-<TGConnectingPoint num="2" id="192" />
-<TGConnectingPoint num="3" id="193" />
-<TGConnectingPoint num="4" id="194" />
-<TGConnectingPoint num="5" id="195" />
-<TGConnectingPoint num="6" id="196" />
-<TGConnectingPoint num="7" id="197" />
-<extraparam>
-<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="" />
+<cdrectangleparam minX="0" maxX="429" minY="0" maxY="344" />
+<infoparam name="TGComponent" value="Timer" />
+<TGConnectingPoint num="0" id="139" />
+<TGConnectingPoint num="1" id="140" />
+<TGConnectingPoint num="2" id="141" />
+<TGConnectingPoint num="3" id="142" />
+<TGConnectingPoint num="4" id="143" />
+<TGConnectingPoint num="5" id="144" />
+<TGConnectingPoint num="6" id="145" />
+<TGConnectingPoint num="7" id="146" />
+<extraparam>
+<Data isAttacker="No" />
 <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="165" >
-<father id="198" num="0" />
-<cdparam x="723" y="112" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event send" />
-<TGConnectingPoint num="0" id="164" />
-<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" />
-<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="167" >
-<father id="198" num="1" />
-<cdparam x="580" y="85" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="134" >
+<father id="147" num="0" />
+<cdparam x="1224" y="432" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event reset, pTS" />
-<TGConnectingPoint num="0" id="166" />
+<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
+<infoparam name="TGComponent" value="Event stop" />
+<TGConnectingPoint num="0" id="133" />
 <extraparam>
-<Prop commName="reset, pTS" 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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -986,16 +980,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="169" >
-<father id="198" num="2" />
-<cdparam x="523" y="323" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="136" >
+<father id="147" num="1" />
+<cdparam x="1224" y="404" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event answerToReset, pTSConfirm" />
-<TGConnectingPoint num="0" id="168" />
+<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
+<infoparam name="TGComponent" value="Request req_Timer" />
+<TGConnectingPoint num="0" id="135" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1003,16 +997,16 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="171" >
-<father id="198" num="3" />
-<cdparam x="522" y="248" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1203" id="138" >
+<father id="147" num="2" />
+<cdparam x="1224" y="369" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Channel fromSCtoD" />
-<TGConnectingPoint num="0" id="170" />
+<cdrectangleparam minX="-10" maxX="131" minY="-10" maxY="132" />
+<infoparam name="TGComponent" value="Event timeOut" />
+<TGConnectingPoint num="0" id="137" />
 <extraparam>
-<Prop commName="fromSCtoD" 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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1020,67 +1014,78 @@
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="173" >
-<father id="198" num="4" />
-<cdparam x="522" y="203" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1201" id="166" >
+<father id="175" num="2" />
+<cdparam x="831" y="363" />
+<sizeparam width="26" height="26" minWidth="10" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Channel fromDtoSC" />
-<TGConnectingPoint num="0" id="172" />
-<extraparam>
-<Prop commName="fromDtoSC" commType="0" 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" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-</extraparam>
+<cdrectangleparam minX="-13" maxX="557" minY="-13" maxY="473" />
+<infoparam name="Composite port" value="" />
+<TGConnectingPoint num="0" id="148" />
+<TGConnectingPoint num="1" id="149" />
+<TGConnectingPoint num="2" id="150" />
+<TGConnectingPoint num="3" id="151" />
+<TGConnectingPoint num="4" id="152" />
+<TGConnectingPoint num="5" id="153" />
+<TGConnectingPoint num="6" id="154" />
+<TGConnectingPoint num="7" id="155" />
+<TGConnectingPoint num="8" id="156" />
+<TGConnectingPoint num="9" id="157" />
+<TGConnectingPoint num="10" id="158" />
+<TGConnectingPoint num="11" id="159" />
+<TGConnectingPoint num="12" id="160" />
+<TGConnectingPoint num="13" id="161" />
+<TGConnectingPoint num="14" id="162" />
+<TGConnectingPoint num="15" id="163" />
+<TGConnectingPoint num="16" id="164" />
+<TGConnectingPoint num="17" id="165" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="175" >
-<father id="198" num="5" />
-<cdparam x="522" y="291" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1202" id="198" >
+<father id="207" num="2" />
+<cdparam x="565" y="418" />
+<sizeparam width="240" height="146" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event data_Ready_SC" />
-<TGConnectingPoint num="0" id="174" />
+<cdrectangleparam minX="0" maxX="696" minY="0" maxY="384" />
+<infoparam name="TGComponent" value="Application" />
+<TGConnectingPoint num="0" id="190" />
+<TGConnectingPoint num="1" id="191" />
+<TGConnectingPoint num="2" id="192" />
+<TGConnectingPoint num="3" id="193" />
+<TGConnectingPoint num="4" id="194" />
+<TGConnectingPoint num="5" id="195" />
+<TGConnectingPoint num="6" id="196" />
+<TGConnectingPoint num="7" id="197" />
 <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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Data isAttacker="No" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="177" >
-<father id="198" num="6" />
-<cdparam x="522" y="157" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="198" num="0" />
+<cdparam x="661" y="408" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event data_Ready" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Request start_Application" />
 <TGConnectingPoint num="0" id="176" />
 <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" />
-<Type type="1" typeOther="" />
-<Type type="2" typeOther="" />
+<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" referenceReq="" />
+<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="179" >
-<father id="198" num="7" />
-<cdparam x="723" y="271" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="198" num="1" />
+<cdparam x="795" y="544" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Channel fromTtoP" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Channel fromAtoT" />
 <TGConnectingPoint num="0" id="178" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1089,15 +1094,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="181" >
-<father id="198" num="8" />
-<cdparam x="723" y="235" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="198" num="2" />
+<cdparam x="795" y="512" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Channel fromPtoT" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Event receive_Application" />
 <TGConnectingPoint num="0" id="180" />
 <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" />
+<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="VOID" associatedEvent="VOID" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1106,15 +1111,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="183" >
-<father id="198" num="9" />
-<cdparam x="723" y="191" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="198" num="3" />
+<cdparam x="795" y="451" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Event receive" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Event open, abort, close" />
 <TGConnectingPoint num="0" id="182" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1123,15 +1128,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="185" >
-<father id="198" num="10" />
-<cdparam x="723" y="302" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<father id="198" num="4" />
+<cdparam x="795" y="483" />
+<sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-13" maxX="188" minY="-13" maxY="225" />
-<infoparam name="TGComponent" value="Request start_TCP_IP" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Event send_TCP" />
 <TGConnectingPoint num="0" id="184" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1140,15 +1145,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="187" >
-<father id="198" num="11" />
-<cdparam x="525" y="117" />
+<father id="198" num="5" />
+<cdparam x="795" y="422" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="191" minY="-10" maxY="228" />
-<infoparam name="TGComponent" value="Request activation" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Channel fromTtoA" />
 <TGConnectingPoint num="0" id="186" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1157,15 +1162,15 @@
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="189" >
-<father id="198" num="12" />
-<cdparam x="620" y="326" />
+<father id="198" num="6" />
+<cdparam x="742" y="408" />
 <sizeparam width="21" height="21" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-10" maxX="191" minY="-10" maxY="228" />
-<infoparam name="TGComponent" value="Request start_Application" />
+<cdrectangleparam minX="-10" maxX="230" minY="-10" maxY="136" />
+<infoparam name="TGComponent" value="Request start_TCP_IP" />
 <TGConnectingPoint num="0" id="188" />
 <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" />
+<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" referenceReq="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1364,7 +1369,7 @@
 <TGConnectingPoint num="0" id="258" />
 <TGConnectingPoint num="1" id="259" />
 <extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" />
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
@@ -1424,7 +1429,7 @@
 <TGConnectingPoint num="0" id="271" />
 <TGConnectingPoint num="1" id="272" />
 <extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" />
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
@@ -1649,513 +1654,386 @@
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1000" id="307" >
-<cdparam x="159" y="66" />
+<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1012" id="313" >
+<cdparam x="491" y="277" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="309" />
+<TGConnectingPoint num="1" id="310" />
+<TGConnectingPoint num="2" id="311" />
+<TGConnectingPoint num="3" id="312" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="306" >
+<father id="313" num="0" />
+<cdparam x="466" y="287" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="307" >
+<father id="313" num="1" />
+<cdparam x="526" y="287" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="308" >
+<father id="313" num="2" />
+<cdparam x="511" y="322" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
+
+<COMPONENT type="1000" id="315" >
+<cdparam x="501" y="91" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="306" />
+<TGConnectingPoint num="0" id="314" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="310" >
-<cdparam x="138" y="129" />
-<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="318" >
+<cdparam x="482" y="129" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="reset() " />
-<TGConnectingPoint num="0" id="308" />
-<TGConnectingPoint num="1" id="309" />
+<infoparam name="send event" value="open()" />
+<TGConnectingPoint num="0" id="316" />
+<TGConnectingPoint num="1" id="317" />
 <extraparam>
-<Data eventName="reset" nbOfParams="5" />
+<Data eventName="open" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="313" >
-<cdparam x="108" y="182" />
-<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="321" >
+<cdparam x="466" y="178" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="answerToReset()" />
-<TGConnectingPoint num="0" id="311" />
-<TGConnectingPoint num="1" id="312" />
+<infoparam name="write channel" value="fromAtoT(1)" />
+<TGConnectingPoint num="0" id="319" />
+<TGConnectingPoint num="1" id="320" />
 <extraparam>
-<Data eventName="answerToReset" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1010" id="316" >
-<cdparam x="143" y="237" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="pTS() " />
-<TGConnectingPoint num="0" id="314" />
-<TGConnectingPoint num="1" id="315" />
-<extraparam>
-<Data eventName="pTS" nbOfParams="5" />
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="319" >
-<cdparam x="121" y="308" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="324" >
+<cdparam x="467" y="226" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="pTSConfirm()" />
-<TGConnectingPoint num="0" id="317" />
-<TGConnectingPoint num="1" id="318" />
+<infoparam name="send event" value="send_TCP()" />
+<TGConnectingPoint num="0" id="322" />
+<TGConnectingPoint num="1" id="323" />
 <extraparam>
-<Data eventName="pTSConfirm" nbOfParams="5" />
+<Data eventName="send_TCP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="336" >
-<cdparam x="376" y="98" />
-<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="326" >
+<cdparam x="576" y="388" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="The first two layers of the OSI model 
-are used to communicate between 
-the smart card and the terminal
-" />
-<TGConnectingPoint num="0" id="320" />
-<TGConnectingPoint num="1" id="321" />
-<TGConnectingPoint num="2" id="322" />
-<TGConnectingPoint num="3" id="323" />
-<TGConnectingPoint num="4" id="324" />
-<TGConnectingPoint num="5" id="325" />
-<TGConnectingPoint num="6" id="326" />
-<TGConnectingPoint num="7" id="327" />
-<TGConnectingPoint num="8" id="328" />
-<TGConnectingPoint num="9" id="329" />
-<TGConnectingPoint num="10" id="330" />
-<TGConnectingPoint num="11" id="331" />
-<TGConnectingPoint num="12" id="332" />
-<TGConnectingPoint num="13" id="333" />
-<TGConnectingPoint num="14" id="334" />
-<TGConnectingPoint num="15" id="335" />
-<extraparam>
-<Line value="The first two layers of the OSI model " />
-<Line value="are used to communicate between " />
-<Line value="the smart card and the terminal" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="325" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="339" >
-<cdparam x="250" y="97" />
-<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="329" >
+<cdparam x="559" y="329" />
+<sizeparam width="54" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_TCP_IP()" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
+<infoparam name="send event" value="abort()" />
+<TGConnectingPoint num="0" id="327" />
+<TGConnectingPoint num="1" id="328" />
 <extraparam>
-<Data requestName="start_TCP_IP" nbOfParams="5" />
+<Data eventName="abort" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="342" >
-<cdparam x="236" y="148" />
-<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="332" >
+<cdparam x="406" y="337" />
+<sizeparam width="53" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send request" value="start_Application()" />
-<TGConnectingPoint num="0" id="340" />
-<TGConnectingPoint num="1" id="341" />
+<infoparam name="send event" value="close()" />
+<TGConnectingPoint num="0" id="330" />
+<TGConnectingPoint num="1" id="331" />
 <extraparam>
-<Data requestName="start_Application" nbOfParams="5" />
+<Data eventName="close" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="344" >
-<cdparam x="515" y="428" />
+<COMPONENT type="1001" id="334" >
+<cdparam x="422" y="386" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="343" />
+<TGConnectingPoint num="0" id="333" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="347" >
-<cdparam x="305" y="350" />
-<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="data_Ready_SC()" />
-<TGConnectingPoint num="0" id="345" />
-<TGConnectingPoint num="1" id="346" />
-<extraparam>
-<Data eventName="data_Ready_SC" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
+<CONNECTOR type="115" id="335" >
+<cdparam x="509" y="94" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to send event" value="null" />
+<P1  x="508" y="111" id="314" />
+<P2  x="508" y="124" id="316" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="336" >
+<cdparam x="508" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1  x="508" y="154" id="317" />
+<P2  x="508" y="173" id="319" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="337" >
+<cdparam x="508" y="222" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to send event" value="null" />
+<P1  x="508" y="203" id="320" />
+<P2  x="507" y="221" id="322" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="338" >
+<cdparam x="586" y="354" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1  x="586" y="354" id="328" />
+<P2  x="586" y="383" id="325" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="339" >
+<cdparam x="508" y="298" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to choice" value="null" />
+<P1  x="507" y="251" id="323" />
+<P2  x="506" y="267" id="309" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="340" >
+<cdparam x="470" y="348" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1  x="466" y="292" id="310" />
+<P2  x="432" y="332" id="330" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="341" >
+<cdparam x="432" y="362" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1  x="432" y="362" id="331" />
+<P2  x="432" y="381" id="333" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="342" >
+<cdparam x="550" y="348" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1  x="546" y="292" id="311" />
+<P2  x="586" y="324" id="327" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
 
-<COMPONENT type="1001" id="349" >
-<cdparam x="352" y="426" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="348" />
-</COMPONENT>
+</TMLActivityDiagramPanel>
 
-<COMPONENT type="1009" id="352" >
-<cdparam x="318" y="308" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1012" id="350" >
+<cdparam x="509" y="222" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromTtoP(1) " />
-<TGConnectingPoint num="0" id="350" />
-<TGConnectingPoint num="1" id="351" />
-<extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
-</extraparam>
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="346" />
+<TGConnectingPoint num="1" id="347" />
+<TGConnectingPoint num="2" id="348" />
+<TGConnectingPoint num="3" id="349" />
 </COMPONENT>
-
-<COMPONENT type="1010" id="355" >
-<cdparam x="335" y="264" />
-<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="343" >
+<father id="350" num="0" />
+<cdparam x="464" y="232" />
+<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="send() " />
-<TGConnectingPoint num="0" id="353" />
-<TGConnectingPoint num="1" id="354" />
-<extraparam>
-<Data eventName="send" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1006" id="358" >
-<cdparam x="315" y="392" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
+<infoparam name="guard 1" value="[ x==0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="344" >
+<father id="350" num="1" />
+<cdparam x="544" y="234" />
+<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromSCtoD(1)" />
-<TGConnectingPoint num="0" id="356" />
-<TGConnectingPoint num="1" id="357" />
-<extraparam>
-<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="1008" id="361" >
-<cdparam x="493" y="350" />
-<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
+<infoparam name="guard 2" value="[ x&gt;0 ]" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="345" >
+<father id="350" num="2" />
+<cdparam x="529" y="267" />
+<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="receive()" />
-<TGConnectingPoint num="0" id="359" />
-<TGConnectingPoint num="1" id="360" />
-<extraparam>
-<Data eventName="receive" nbOfParams="5" />
-</extraparam>
-</COMPONENT>
+<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
+<infoparam name="guard 3" value="[ ]" />
+</SUBCOMPONENT>
 
-<COMPONENT type="1009" id="364" >
-<cdparam x="476" y="311" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1000" id="352" >
+<cdparam x="517" y="87" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="read channel" value="fromDtoSC(1) " />
-<TGConnectingPoint num="0" id="362" />
-<TGConnectingPoint num="1" id="363" />
-<extraparam>
-<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" />
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="351" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="367" >
-<cdparam x="483" y="387" />
-<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="354" >
+<cdparam x="417" y="367" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromPtoT(1)" />
-<TGConnectingPoint num="0" id="365" />
-<TGConnectingPoint num="1" id="366" />
-<extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" />
-</extraparam>
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="353" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="370" >
-<cdparam x="466" y="268" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="357" >
+<cdparam x="393" y="299" />
+<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="data_Ready(t, b) " />
-<TGConnectingPoint num="0" id="368" />
-<TGConnectingPoint num="1" id="369" />
-<breakpoint />
+<infoparam name="send event" value="timeOut()" />
+<TGConnectingPoint num="0" id="355" />
+<TGConnectingPoint num="1" id="356" />
 <extraparam>
-<Data eventName="data_Ready" nbOfParams="5" />
-<Param index="0" value="t" />
-<Param index="1" value="b" />
+<Data eventName="timeOut" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1014" id="374" >
-<cdparam x="236" y="202" />
-<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="360" >
+<cdparam x="596" y="300" />
+<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
-<TGConnectingPoint num="0" id="371" />
-<TGConnectingPoint num="1" id="372" />
-<TGConnectingPoint num="2" id="373" />
+<infoparam name="wait event" value="stop() " />
+<TGConnectingPoint num="0" id="358" />
+<TGConnectingPoint num="1" id="359" />
 <extraparam>
-<Data init="j=0" condition="x==0" increment="j = j" />
+<Data eventName="stop" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="376" >
-<cdparam x="297" y="231" />
+<COMPONENT type="1001" id="362" >
+<cdparam x="612" y="365" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="0" id="361" />
 </COMPONENT>
 
-<COMPONENT type="1018" id="387" >
-<cdparam x="424" y="226" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1017" id="365" >
+<cdparam x="487" y="150" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="377" />
-<TGConnectingPoint num="1" id="378" />
-<TGConnectingPoint num="2" id="379" />
-<TGConnectingPoint num="3" id="380" />
-<TGConnectingPoint num="4" id="381" />
-<TGConnectingPoint num="5" id="382" />
-<TGConnectingPoint num="6" id="383" />
-<TGConnectingPoint num="7" id="384" />
-<TGConnectingPoint num="8" id="385" />
-<TGConnectingPoint num="9" id="386" />
-</COMPONENT>
-
-<CONNECTOR type="115" id="392" >
-<cdparam x="111" y="331" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to send request" value="null" />
-<P1  x="166" y="333" id="318" />
-<P2  x="298" y="92" id="337" />
-<Point x="166" y="351" />
-<Point x="231" y="351" />
-<Point x="231" y="72" />
-<Point x="298" y="72" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="388" >
-<father id="392" num="0" />
-<cdparam x="166" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="389" >
-<father id="392" num="1" />
-<cdparam x="231" y="351" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="390" >
-<father id="392" num="2" />
-<cdparam x="231" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="391" >
-<father id="392" num="3" />
-<cdparam x="298" y="72" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
+<infoparam name="notified event" value="x=?stop()" />
+<TGConnectingPoint num="0" id="363" />
+<TGConnectingPoint num="1" id="364" />
+<extraparam>
+<Data eventName="stop" variable="x" />
+</extraparam>
+</COMPONENT>
 
-<CONNECTOR type="115" id="393" >
-<cdparam x="166" y="64" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to wait event" value="null" />
-<P1  x="166" y="86" id="306" />
-<P2  x="166" y="124" id="308" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="394" >
-<cdparam x="166" y="154" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1  x="166" y="154" id="309" />
-<P2  x="166" y="177" id="311" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="395" >
-<cdparam x="312" y="133" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to send request" value="null" />
-<P1  x="298" y="122" id="338" />
-<P2  x="298" y="143" id="340" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="396" >
-<cdparam x="355" y="300" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="362" y="289" id="354" />
-<P2  x="362" y="303" id="350" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="397" >
-<cdparam x="355" y="365" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1  x="362" y="333" id="351" />
-<P2  x="362" y="345" id="345" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="398" >
-<cdparam x="355" y="417" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1  x="362" y="375" id="346" />
-<P2  x="362" y="387" id="356" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="399" >
-<cdparam x="355" y="473" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="362" y="417" id="357" />
-<P2  x="362" y="421" id="348" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="400" >
-<cdparam x="541" y="358" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from read channel to send event" value="null" />
-<P1  x="525" y="336" id="363" />
-<P2  x="525" y="345" id="359" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="401" >
-<cdparam x="540" y="402" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1  x="525" y="375" id="360" />
-<P2  x="525" y="382" id="365" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="402" >
-<cdparam x="543" y="305" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="525" y="293" id="369" />
-<P2  x="525" y="306" id="362" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="403" >
-<cdparam x="540" y="464" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="525" y="412" id="366" />
-<P2  x="525" y="423" id="343" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="404" >
-<cdparam x="298" y="173" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send request to for loop" value="null" />
-<P1  x="298" y="173" id="341" />
-<P2  x="298" y="197" id="371" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="405" >
-<cdparam x="328" y="232" />
+<CONNECTOR type="115" id="366" >
+<cdparam x="427" y="324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to stop state" value="null" />
-<P1  x="298" y="227" id="373" />
-<P2  x="307" y="226" id="375" />
+<infoparam name="connector from send event to stop state" value="null" />
+<P1  x="427" y="324" id="356" />
+<P2  x="427" y="362" id="353" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="406" >
-<cdparam x="395" y="283" />
+<CONNECTOR type="115" id="367" >
+<cdparam x="622" y="325" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1  x="399" y="241" id="378" />
-<P2  x="362" y="259" id="353" />
+<infoparam name="connector from wait event to stop state" value="null" />
+<P1  x="622" y="325" id="359" />
+<P2  x="622" y="360" id="361" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="407" >
-<cdparam x="543" y="341" />
+<CONNECTOR type="115" id="368" >
+<cdparam x="524" y="107" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from select to wait event" value="null" />
-<P1  x="479" y="241" id="379" />
-<P2  x="525" y="263" id="368" />
+<infoparam name="connector from start state to notified event" value="null" />
+<P1  x="524" y="107" id="351" />
+<P2  x="524" y="145" id="363" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="408" >
-<cdparam x="391" y="282" />
+<CONNECTOR type="115" id="369" >
+<cdparam x="524" y="175" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from for loop to select" value="null" />
-<P1  x="360" y="216" id="372" />
-<P2  x="439" y="216" id="377" />
+<infoparam name="connector from notified event to choice" value="null" />
+<P1  x="524" y="175" id="364" />
+<P2  x="524" y="212" id="346" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="409" >
-<cdparam x="164" y="262" />
+<CONNECTOR type="115" id="370" >
+<cdparam x="484" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to send event" value="null" />
-<P1  x="166" y="262" id="315" />
-<P2  x="166" y="303" id="317" />
+<infoparam name="connector from choice to send event" value="null" />
+<P1  x="484" y="237" id="347" />
+<P2  x="427" y="294" id="355" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="410" >
-<cdparam x="166" y="207" />
+<CONNECTOR type="115" id="371" >
+<cdparam x="564" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to wait event" value="null" />
-<P1  x="166" y="207" id="312" />
-<P2  x="166" y="232" id="314" />
+<infoparam name="connector from choice to wait event" value="null" />
+<P1  x="564" y="237" id="348" />
+<P2  x="622" y="295" id="358" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="TCPIP" minX="10" maxX="2900" minY="10" maxY="1900" >
-<COMPONENT type="1012" id="418" >
+<COMPONENT type="1012" id="379" >
 <cdparam x="2086" y="1378" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="414" />
-<TGConnectingPoint num="1" id="415" />
-<TGConnectingPoint num="2" id="416" />
-<TGConnectingPoint num="3" id="417" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
+<TGConnectingPoint num="2" id="377" />
+<TGConnectingPoint num="3" id="378" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="411" >
-<father id="418" num="0" />
+<SUBCOMPONENT type="-1" id="372" >
+<father id="379" num="0" />
 <cdparam x="2061" y="1388" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="412" >
-<father id="418" num="1" />
+<SUBCOMPONENT type="-1" id="373" >
+<father id="379" num="1" />
 <cdparam x="2121" y="1388" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="413" >
-<father id="418" num="2" />
+<SUBCOMPONENT type="-1" id="374" >
+<father id="379" num="2" />
 <cdparam x="2106" y="1426" />
 <sizeparam width="135" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2163,35 +2041,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==10 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="426" >
+<COMPONENT type="1012" id="387" >
 <cdparam x="2262" y="951" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="422" />
-<TGConnectingPoint num="1" id="423" />
-<TGConnectingPoint num="2" id="424" />
-<TGConnectingPoint num="3" id="425" />
+<TGConnectingPoint num="0" id="383" />
+<TGConnectingPoint num="1" id="384" />
+<TGConnectingPoint num="2" id="385" />
+<TGConnectingPoint num="3" id="386" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="419" >
-<father id="426" num="0" />
+<SUBCOMPONENT type="-1" id="380" >
+<father id="387" num="0" />
 <cdparam x="2212" y="961" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==1 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="420" >
-<father id="426" num="1" />
+<SUBCOMPONENT type="-1" id="381" >
+<father id="387" num="1" />
 <cdparam x="2297" y="961" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ tcpctrl.state ==3 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="421" >
-<father id="426" num="2" />
+<SUBCOMPONENT type="-1" id="382" >
+<father id="387" num="2" />
 <cdparam x="2282" y="996" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2199,35 +2077,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ else ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="434" >
+<COMPONENT type="1012" id="395" >
 <cdparam x="1981" y="1346" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="430" />
-<TGConnectingPoint num="1" id="431" />
-<TGConnectingPoint num="2" id="432" />
-<TGConnectingPoint num="3" id="433" />
+<TGConnectingPoint num="0" id="391" />
+<TGConnectingPoint num="1" id="392" />
+<TGConnectingPoint num="2" id="393" />
+<TGConnectingPoint num="3" id="394" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="427" >
-<father id="434" num="0" />
+<SUBCOMPONENT type="-1" id="388" >
+<father id="395" num="0" />
 <cdparam x="1934" y="1356" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==5 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="428" >
-<father id="434" num="1" />
+<SUBCOMPONENT type="-1" id="389" >
+<father id="395" num="1" />
 <cdparam x="2016" y="1356" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="429" >
-<father id="434" num="2" />
+<SUBCOMPONENT type="-1" id="390" >
+<father id="395" num="2" />
 <cdparam x="2001" y="1391" />
 <sizeparam width="131" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2235,35 +2113,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state == 7 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="442" >
+<COMPONENT type="1012" id="403" >
 <cdparam x="1811" y="1269" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="438" />
-<TGConnectingPoint num="1" id="439" />
-<TGConnectingPoint num="2" id="440" />
-<TGConnectingPoint num="3" id="441" />
+<TGConnectingPoint num="0" id="399" />
+<TGConnectingPoint num="1" id="400" />
+<TGConnectingPoint num="2" id="401" />
+<TGConnectingPoint num="3" id="402" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="435" >
-<father id="442" num="0" />
+<SUBCOMPONENT type="-1" id="396" >
+<father id="403" num="0" />
 <cdparam x="1762" y="1279" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="436" >
-<father id="442" num="1" />
+<SUBCOMPONENT type="-1" id="397" >
+<father id="403" num="1" />
 <cdparam x="1846" y="1279" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="437" >
-<father id="442" num="2" />
+<SUBCOMPONENT type="-1" id="398" >
+<father id="403" num="2" />
 <cdparam x="1831" y="1314" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2271,35 +2149,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==2 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="450" >
+<COMPONENT type="1012" id="411" >
 <cdparam x="1716" y="1141" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="446" />
-<TGConnectingPoint num="1" id="447" />
-<TGConnectingPoint num="2" id="448" />
-<TGConnectingPoint num="3" id="449" />
+<TGConnectingPoint num="0" id="407" />
+<TGConnectingPoint num="1" id="408" />
+<TGConnectingPoint num="2" id="409" />
+<TGConnectingPoint num="3" id="410" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="443" >
-<father id="450" num="0" />
+<SUBCOMPONENT type="-1" id="404" >
+<father id="411" num="0" />
 <cdparam x="1691" y="1151" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="444" >
-<father id="450" num="1" />
+<SUBCOMPONENT type="-1" id="405" >
+<father id="411" num="1" />
 <cdparam x="1751" y="1151" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="445" >
-<father id="450" num="2" />
+<SUBCOMPONENT type="-1" id="406" >
+<father id="411" num="2" />
 <cdparam x="1736" y="1186" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2307,17 +2185,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="454" >
+<COMPONENT type="1013" id="415" >
 <cdparam x="1524" y="1254" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="452" />
-<TGConnectingPoint num="1" id="453" />
+<TGConnectingPoint num="0" id="413" />
+<TGConnectingPoint num="1" id="414" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="451" >
-<father id="454" num="0" />
+<SUBCOMPONENT type="-1" id="412" >
+<father id="415" num="0" />
 <cdparam x="1539" y="1274" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2325,17 +2203,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="458" >
+<COMPONENT type="1013" id="419" >
 <cdparam x="1524" y="1064" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="456" />
-<TGConnectingPoint num="1" id="457" />
+<TGConnectingPoint num="0" id="417" />
+<TGConnectingPoint num="1" id="418" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="455" >
-<father id="458" num="0" />
+<SUBCOMPONENT type="-1" id="416" >
+<father id="419" num="0" />
 <cdparam x="1538" y="1088" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2343,35 +2221,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="466" >
+<COMPONENT type="1012" id="427" >
 <cdparam x="1592" y="1006" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="462" />
-<TGConnectingPoint num="1" id="463" />
-<TGConnectingPoint num="2" id="464" />
-<TGConnectingPoint num="3" id="465" />
+<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="1" id="424" />
+<TGConnectingPoint num="2" id="425" />
+<TGConnectingPoint num="3" id="426" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="459" >
-<father id="466" num="0" />
+<SUBCOMPONENT type="-1" id="420" >
+<father id="427" num="0" />
 <cdparam x="1542" y="1016" />
 <sizeparam width="135" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state  == 4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="460" >
-<father id="466" num="1" />
+<SUBCOMPONENT type="-1" id="421" >
+<father id="427" num="1" />
 <cdparam x="1627" y="1016" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="461" >
-<father id="466" num="2" />
+<SUBCOMPONENT type="-1" id="422" >
+<father id="427" num="2" />
 <cdparam x="1612" y="1051" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2379,35 +2257,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="474" >
+<COMPONENT type="1012" id="435" >
 <cdparam x="1713" y="875" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="470" />
-<TGConnectingPoint num="1" id="471" />
-<TGConnectingPoint num="2" id="472" />
-<TGConnectingPoint num="3" id="473" />
+<TGConnectingPoint num="0" id="431" />
+<TGConnectingPoint num="1" id="432" />
+<TGConnectingPoint num="2" id="433" />
+<TGConnectingPoint num="3" id="434" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="467" >
-<father id="474" num="0" />
+<SUBCOMPONENT type="-1" id="428" >
+<father id="435" num="0" />
 <cdparam x="1688" y="885" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="468" >
-<father id="474" num="1" />
+<SUBCOMPONENT type="-1" id="429" >
+<father id="435" num="1" />
 <cdparam x="1748" y="885" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="469" >
-<father id="474" num="2" />
+<SUBCOMPONENT type="-1" id="430" >
+<father id="435" num="2" />
 <cdparam x="1733" y="920" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2415,17 +2293,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="478" >
+<COMPONENT type="1013" id="439" >
 <cdparam x="1636" y="1235" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="476" />
-<TGConnectingPoint num="1" id="477" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="475" >
-<father id="478" num="0" />
+<SUBCOMPONENT type="-1" id="436" >
+<father id="439" num="0" />
 <cdparam x="1655" y="1254" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2433,17 +2311,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="482" >
+<COMPONENT type="1013" id="443" >
 <cdparam x="2213" y="1059" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="480" />
-<TGConnectingPoint num="1" id="481" />
+<TGConnectingPoint num="0" id="441" />
+<TGConnectingPoint num="1" id="442" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="479" >
-<father id="482" num="0" />
+<SUBCOMPONENT type="-1" id="440" >
+<father id="443" num="0" />
 <cdparam x="2200" y="1083" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2451,17 +2329,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="486" >
+<COMPONENT type="1013" id="447" >
 <cdparam x="2336" y="1024" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="484" />
-<TGConnectingPoint num="1" id="485" />
+<TGConnectingPoint num="0" id="445" />
+<TGConnectingPoint num="1" id="446" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="483" >
-<father id="486" num="0" />
+<SUBCOMPONENT type="-1" id="444" >
+<father id="447" num="0" />
 <cdparam x="2312" y="1044" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2469,35 +2347,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="494" >
+<COMPONENT type="1012" id="455" >
 <cdparam x="1193" y="1020" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="490" />
-<TGConnectingPoint num="1" id="491" />
-<TGConnectingPoint num="2" id="492" />
-<TGConnectingPoint num="3" id="493" />
+<TGConnectingPoint num="0" id="451" />
+<TGConnectingPoint num="1" id="452" />
+<TGConnectingPoint num="2" id="453" />
+<TGConnectingPoint num="3" id="454" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="487" >
-<father id="494" num="0" />
+<SUBCOMPONENT type="-1" id="448" >
+<father id="455" num="0" />
 <cdparam x="1168" y="1030" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="488" >
-<father id="494" num="1" />
+<SUBCOMPONENT type="-1" id="449" >
+<father id="455" num="1" />
 <cdparam x="1228" y="1030" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="489" >
-<father id="494" num="2" />
+<SUBCOMPONENT type="-1" id="450" >
+<father id="455" num="2" />
 <cdparam x="1213" y="1065" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2505,17 +2383,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==6 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="498" >
+<COMPONENT type="1013" id="459" >
 <cdparam x="1203" y="1107" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="496" />
-<TGConnectingPoint num="1" id="497" />
+<TGConnectingPoint num="0" id="457" />
+<TGConnectingPoint num="1" id="458" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="495" >
-<father id="498" num="0" />
+<SUBCOMPONENT type="-1" id="456" >
+<father id="459" num="0" />
 <cdparam x="1218" y="1127" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2523,35 +2401,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="506" >
+<COMPONENT type="1012" id="467" >
 <cdparam x="557" y="712" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="502" />
-<TGConnectingPoint num="1" id="503" />
-<TGConnectingPoint num="2" id="504" />
-<TGConnectingPoint num="3" id="505" />
+<TGConnectingPoint num="0" id="463" />
+<TGConnectingPoint num="1" id="464" />
+<TGConnectingPoint num="2" id="465" />
+<TGConnectingPoint num="3" id="466" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="499" >
-<father id="506" num="0" />
+<SUBCOMPONENT type="-1" id="460" >
+<father id="467" num="0" />
 <cdparam x="514" y="722" />
 <sizeparam width="131" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state == 1 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="500" >
-<father id="506" num="1" />
+<SUBCOMPONENT type="-1" id="461" >
+<father id="467" num="1" />
 <cdparam x="592" y="722" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="501" >
-<father id="506" num="2" />
+<SUBCOMPONENT type="-1" id="462" >
+<father id="467" num="2" />
 <cdparam x="577" y="757" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2559,17 +2437,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="510" >
+<COMPONENT type="1013" id="471" >
 <cdparam x="717" y="694" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="508" />
-<TGConnectingPoint num="1" id="509" />
+<TGConnectingPoint num="0" id="469" />
+<TGConnectingPoint num="1" id="470" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="507" >
-<father id="510" num="0" />
+<SUBCOMPONENT type="-1" id="468" >
+<father id="471" num="0" />
 <cdparam x="732" y="714" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2577,17 +2455,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="514" >
+<COMPONENT type="1013" id="475" >
 <cdparam x="938" y="1025" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="512" />
-<TGConnectingPoint num="1" id="513" />
+<TGConnectingPoint num="0" id="473" />
+<TGConnectingPoint num="1" id="474" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="511" >
-<father id="514" num="0" />
+<SUBCOMPONENT type="-1" id="472" >
+<father id="475" num="0" />
 <cdparam x="953" y="1045" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2595,35 +2473,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="522" >
+<COMPONENT type="1012" id="483" >
 <cdparam x="1034" y="939" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="518" />
-<TGConnectingPoint num="1" id="519" />
-<TGConnectingPoint num="2" id="520" />
-<TGConnectingPoint num="3" id="521" />
+<TGConnectingPoint num="0" id="479" />
+<TGConnectingPoint num="1" id="480" />
+<TGConnectingPoint num="2" id="481" />
+<TGConnectingPoint num="3" id="482" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="515" >
-<father id="522" num="0" />
+<SUBCOMPONENT type="-1" id="476" >
+<father id="483" num="0" />
 <cdparam x="989" y="949" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="516" >
-<father id="522" num="1" />
+<SUBCOMPONENT type="-1" id="477" >
+<father id="483" num="1" />
 <cdparam x="1070" y="949" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="517" >
-<father id="522" num="2" />
+<SUBCOMPONENT type="-1" id="478" >
+<father id="483" num="2" />
 <cdparam x="1054" y="984" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2631,17 +2509,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state == 5]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="526" >
+<COMPONENT type="1013" id="487" >
 <cdparam x="795" y="1009" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="524" />
-<TGConnectingPoint num="1" id="525" />
+<TGConnectingPoint num="0" id="485" />
+<TGConnectingPoint num="1" id="486" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="523" >
-<father id="526" num="0" />
+<SUBCOMPONENT type="-1" id="484" >
+<father id="487" num="0" />
 <cdparam x="818" y="1031" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2649,35 +2527,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="534" >
+<COMPONENT type="1012" id="495" >
 <cdparam x="828" y="869" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="530" />
-<TGConnectingPoint num="1" id="531" />
-<TGConnectingPoint num="2" id="532" />
-<TGConnectingPoint num="3" id="533" />
+<TGConnectingPoint num="0" id="491" />
+<TGConnectingPoint num="1" id="492" />
+<TGConnectingPoint num="2" id="493" />
+<TGConnectingPoint num="3" id="494" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="527" >
-<father id="534" num="0" />
+<SUBCOMPONENT type="-1" id="488" >
+<father id="495" num="0" />
 <cdparam x="753" y="885" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="528" >
-<father id="534" num="1" />
+<SUBCOMPONENT type="-1" id="489" >
+<father id="495" num="1" />
 <cdparam x="863" y="879" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="529" >
-<father id="534" num="2" />
+<SUBCOMPONENT type="-1" id="490" >
+<father id="495" num="2" />
 <cdparam x="848" y="914" />
 <sizeparam width="123" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2685,17 +2563,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state==0 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="538" >
+<COMPONENT type="1013" id="499" >
 <cdparam x="341" y="764" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="536" />
-<TGConnectingPoint num="1" id="537" />
+<TGConnectingPoint num="0" id="497" />
+<TGConnectingPoint num="1" id="498" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="535" >
-<father id="538" num="0" />
+<SUBCOMPONENT type="-1" id="496" >
+<father id="499" num="0" />
 <cdparam x="354" y="785" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2703,17 +2581,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="542" >
+<COMPONENT type="1013" id="503" >
 <cdparam x="127" y="794" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="540" />
-<TGConnectingPoint num="1" id="541" />
+<TGConnectingPoint num="0" id="501" />
+<TGConnectingPoint num="1" id="502" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="539" >
-<father id="542" num="0" />
+<SUBCOMPONENT type="-1" id="500" >
+<father id="503" num="0" />
 <cdparam x="146" y="818" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2721,35 +2599,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="550" >
+<COMPONENT type="1012" id="511" >
 <cdparam x="993" y="780" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="546" />
-<TGConnectingPoint num="1" id="547" />
-<TGConnectingPoint num="2" id="548" />
-<TGConnectingPoint num="3" id="549" />
+<TGConnectingPoint num="0" id="507" />
+<TGConnectingPoint num="1" id="508" />
+<TGConnectingPoint num="2" id="509" />
+<TGConnectingPoint num="3" id="510" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="543" >
-<father id="550" num="0" />
+<SUBCOMPONENT type="-1" id="504" >
+<father id="511" num="0" />
 <cdparam x="949" y="793" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="544" >
-<father id="550" num="1" />
+<SUBCOMPONENT type="-1" id="505" >
+<father id="511" num="1" />
 <cdparam x="1028" y="790" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="545" >
-<father id="550" num="2" />
+<SUBCOMPONENT type="-1" id="506" >
+<father id="511" num="2" />
 <cdparam x="1013" y="825" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2757,17 +2635,17 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="554" >
+<COMPONENT type="1013" id="515" >
 <cdparam x="1003" y="701" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="552" />
-<TGConnectingPoint num="1" id="553" />
+<TGConnectingPoint num="0" id="513" />
+<TGConnectingPoint num="1" id="514" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="551" >
-<father id="554" num="0" />
+<SUBCOMPONENT type="-1" id="512" >
+<father id="515" num="0" />
 <cdparam x="1018" y="721" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2775,17 +2653,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="558" >
+<COMPONENT type="1013" id="519" >
 <cdparam x="434" y="783" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="556" />
-<TGConnectingPoint num="1" id="557" />
+<TGConnectingPoint num="0" id="517" />
+<TGConnectingPoint num="1" id="518" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="555" >
-<father id="558" num="0" />
+<SUBCOMPONENT type="-1" id="516" >
+<father id="519" num="0" />
 <cdparam x="449" y="802" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2793,17 +2671,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="562" >
+<COMPONENT type="1013" id="523" >
 <cdparam x="225" y="863" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="560" />
-<TGConnectingPoint num="1" id="561" />
+<TGConnectingPoint num="0" id="521" />
+<TGConnectingPoint num="1" id="522" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="559" >
-<father id="562" num="0" />
+<SUBCOMPONENT type="-1" id="520" >
+<father id="523" num="0" />
 <cdparam x="245" y="885" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2811,17 +2689,17 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="566" >
+<COMPONENT type="1013" id="527" >
 <cdparam x="1044" y="1057" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="564" />
-<TGConnectingPoint num="1" id="565" />
+<TGConnectingPoint num="0" id="525" />
+<TGConnectingPoint num="1" id="526" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="563" >
-<father id="566" num="0" />
+<SUBCOMPONENT type="-1" id="524" >
+<father id="527" num="0" />
 <cdparam x="1059" y="1077" />
 <sizeparam width="8" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2829,35 +2707,35 @@ the smart card and the terminal
 <infoparam name="value of the delay" value="b" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="574" >
+<COMPONENT type="1012" id="535" >
 <cdparam x="173" y="486" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="570" />
-<TGConnectingPoint num="1" id="571" />
-<TGConnectingPoint num="2" id="572" />
-<TGConnectingPoint num="3" id="573" />
+<TGConnectingPoint num="0" id="531" />
+<TGConnectingPoint num="1" id="532" />
+<TGConnectingPoint num="2" id="533" />
+<TGConnectingPoint num="3" id="534" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="567" >
-<father id="574" num="0" />
+<SUBCOMPONENT type="-1" id="528" >
+<father id="535" num="0" />
 <cdparam x="98" y="496" />
 <sizeparam width="123" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="568" >
-<father id="574" num="1" />
+<SUBCOMPONENT type="-1" id="529" >
+<father id="535" num="1" />
 <cdparam x="208" y="496" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="569" >
-<father id="574" num="2" />
+<SUBCOMPONENT type="-1" id="530" >
+<father id="535" num="2" />
 <cdparam x="193" y="531" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2865,35 +2743,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="582" >
+<COMPONENT type="1012" id="543" >
 <cdparam x="359" y="192" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="578" />
-<TGConnectingPoint num="1" id="579" />
-<TGConnectingPoint num="2" id="580" />
-<TGConnectingPoint num="3" id="581" />
+<TGConnectingPoint num="0" id="539" />
+<TGConnectingPoint num="1" id="540" />
+<TGConnectingPoint num="2" id="541" />
+<TGConnectingPoint num="3" id="542" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="575" >
-<father id="582" num="0" />
+<SUBCOMPONENT type="-1" id="536" >
+<father id="543" num="0" />
 <cdparam x="317" y="202" />
 <sizeparam width="88" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.a&gt;0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="576" >
-<father id="582" num="1" />
+<SUBCOMPONENT type="-1" id="537" >
+<father id="543" num="1" />
 <cdparam x="394" y="202" />
 <sizeparam width="98" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ tcpctrl.a==0 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="577" >
-<father id="582" num="2" />
+<SUBCOMPONENT type="-1" id="538" >
+<father id="543" num="2" />
 <cdparam x="379" y="237" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2901,35 +2779,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="590" >
+<COMPONENT type="1012" id="551" >
 <cdparam x="449" y="582" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="586" />
-<TGConnectingPoint num="1" id="587" />
-<TGConnectingPoint num="2" id="588" />
-<TGConnectingPoint num="3" id="589" />
+<TGConnectingPoint num="0" id="547" />
+<TGConnectingPoint num="1" id="548" />
+<TGConnectingPoint num="2" id="549" />
+<TGConnectingPoint num="3" id="550" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="583" >
-<father id="590" num="0" />
+<SUBCOMPONENT type="-1" id="544" >
+<father id="551" num="0" />
 <cdparam x="398" y="592" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state ==9 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="584" >
-<father id="590" num="1" />
+<SUBCOMPONENT type="-1" id="545" >
+<father id="551" num="1" />
 <cdparam x="500" y="599" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="585" >
-<father id="590" num="2" />
+<SUBCOMPONENT type="-1" id="546" >
+<father id="551" num="2" />
 <cdparam x="469" y="627" />
 <sizeparam width="277" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2937,35 +2815,35 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ (tcpctrl.state ==2) or (tcpctrl.state ==4) ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="598" >
+<COMPONENT type="1012" id="559" >
 <cdparam x="274" y="564" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="594" />
-<TGConnectingPoint num="1" id="595" />
-<TGConnectingPoint num="2" id="596" />
-<TGConnectingPoint num="3" id="597" />
+<TGConnectingPoint num="0" id="555" />
+<TGConnectingPoint num="1" id="556" />
+<TGConnectingPoint num="2" id="557" />
+<TGConnectingPoint num="3" id="558" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="591" >
-<father id="598" num="0" />
+<SUBCOMPONENT type="-1" id="552" >
+<father id="559" num="0" />
 <cdparam x="228" y="574" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
 <infoparam name="guard 1" value="[ tcpctrl.state == 1]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="592" >
-<father id="598" num="1" />
+<SUBCOMPONENT type="-1" id="553" >
+<father id="559" num="1" />
 <cdparam x="317" y="584" />
 <sizeparam width="44" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
 <infoparam name="guard 2" value="[ else ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="593" >
-<father id="598" num="2" />
+<SUBCOMPONENT type="-1" id="554" >
+<father id="559" num="2" />
 <cdparam x="294" y="613" />
 <sizeparam width="127" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2973,16 +2851,16 @@ the smart card and the terminal
 <infoparam name="guard 3" value="[ tcpctrl.state ==4 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1000" id="600" >
+<COMPONENT type="1000" id="561" >
 <cdparam x="227" y="27" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="599" />
+<TGConnectingPoint num="0" id="560" />
 </COMPONENT>
 
-<COMPONENT type="301" id="617" >
+<COMPONENT type="301" id="578" >
 <cdparam x="10" y="30" />
 <sizeparam width="98" height="135" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2999,22 +2877,22 @@ the smart card and the terminal
 9: close wait
 10:last ack
 " />
-<TGConnectingPoint num="0" id="601" />
-<TGConnectingPoint num="1" id="602" />
-<TGConnectingPoint num="2" id="603" />
-<TGConnectingPoint num="3" id="604" />
-<TGConnectingPoint num="4" id="605" />
-<TGConnectingPoint num="5" id="606" />
-<TGConnectingPoint num="6" id="607" />
-<TGConnectingPoint num="7" id="608" />
-<TGConnectingPoint num="8" id="609" />
-<TGConnectingPoint num="9" id="610" />
-<TGConnectingPoint num="10" id="611" />
-<TGConnectingPoint num="11" id="612" />
-<TGConnectingPoint num="12" id="613" />
-<TGConnectingPoint num="13" id="614" />
-<TGConnectingPoint num="14" id="615" />
-<TGConnectingPoint num="15" id="616" />
+<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="1" id="563" />
+<TGConnectingPoint num="2" id="564" />
+<TGConnectingPoint num="3" id="565" />
+<TGConnectingPoint num="4" id="566" />
+<TGConnectingPoint num="5" id="567" />
+<TGConnectingPoint num="6" id="568" />
+<TGConnectingPoint num="7" id="569" />
+<TGConnectingPoint num="8" id="570" />
+<TGConnectingPoint num="9" id="571" />
+<TGConnectingPoint num="10" id="572" />
+<TGConnectingPoint num="11" id="573" />
+<TGConnectingPoint num="12" id="574" />
+<TGConnectingPoint num="13" id="575" />
+<TGConnectingPoint num="14" id="576" />
+<TGConnectingPoint num="15" id="577" />
 <extraparam>
 <Line value="0: closed" />
 <Line value="1: Listen" />
@@ -3030,223 +2908,223 @@ the smart card and the terminal
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="620" >
+<COMPONENT type="1011" id="581" >
 <cdparam x="72" y="549" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="618" />
-<TGConnectingPoint num="1" id="619" />
+<TGConnectingPoint num="0" id="579" />
+<TGConnectingPoint num="1" id="580" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="622" >
+<COMPONENT type="1001" id="583" >
 <cdparam x="116" y="615" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="621" />
+<TGConnectingPoint num="0" id="582" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="625" >
+<COMPONENT type="1009" id="586" >
 <cdparam x="964" y="585" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="fromPtoT(1) " />
-<TGConnectingPoint num="0" id="623" />
-<TGConnectingPoint num="1" id="624" />
+<TGConnectingPoint num="0" id="584" />
+<TGConnectingPoint num="1" id="585" />
 <extraparam>
-<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" />
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1014" id="629" >
-<cdparam x="144" y="79" />
+<COMPONENT type="1014" id="590" >
+<cdparam x="145" y="85" />
 <sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="for loop" value="for(i=0;(tcpctrl.a==0);i = i)" />
-<TGConnectingPoint num="0" id="626" />
-<TGConnectingPoint num="1" id="627" />
-<TGConnectingPoint num="2" id="628" />
+<TGConnectingPoint num="0" id="587" />
+<TGConnectingPoint num="1" id="588" />
+<TGConnectingPoint num="2" id="589" />
 <extraparam>
 <Data init="i=0" condition="(tcpctrl.a==0)" increment="i = i" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="631" >
+<COMPONENT type="1001" id="592" >
 <cdparam x="224" y="207" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="630" />
+<TGConnectingPoint num="0" id="591" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="634" >
+<COMPONENT type="1011" id="595" >
 <cdparam x="182" y="144" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state=0" />
-<TGConnectingPoint num="0" id="632" />
-<TGConnectingPoint num="1" id="633" />
+<TGConnectingPoint num="0" id="593" />
+<TGConnectingPoint num="1" id="594" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="637" >
+<COMPONENT type="1017" id="598" >
 <cdparam x="311" y="133" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="notified event" value="tcpctrl.a=?abort()" />
-<TGConnectingPoint num="0" id="635" />
-<TGConnectingPoint num="1" id="636" />
+<TGConnectingPoint num="0" id="596" />
+<TGConnectingPoint num="1" id="597" />
 <extraparam>
 <Data eventName="abort" variable="tcpctrl.a" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="640" >
+<COMPONENT type="1009" id="601" >
 <cdparam x="690" y="589" />
 <sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="638" />
-<TGConnectingPoint num="1" id="639" />
+<TGConnectingPoint num="0" id="599" />
+<TGConnectingPoint num="1" id="600" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="643" >
+<COMPONENT type="1010" id="604" >
 <cdparam x="686" y="534" />
 <sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="timeOut() " />
-<TGConnectingPoint num="0" id="641" />
-<TGConnectingPoint num="1" id="642" />
+<TGConnectingPoint num="0" id="602" />
+<TGConnectingPoint num="1" id="603" />
 <extraparam>
 <Data eventName="timeOut" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="646" >
+<COMPONENT type="1010" id="607" >
 <cdparam x="974" y="528" />
 <sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="receive() " />
-<TGConnectingPoint num="0" id="644" />
-<TGConnectingPoint num="1" id="645" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
 <extraparam>
 <Data eventName="receive" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="649" >
+<COMPONENT type="1010" id="610" >
 <cdparam x="436" y="492" />
 <sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="close() " />
-<TGConnectingPoint num="0" id="647" />
-<TGConnectingPoint num="1" id="648" />
+<TGConnectingPoint num="0" id="608" />
+<TGConnectingPoint num="1" id="609" />
 <extraparam>
 <Data eventName="close" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="652" >
+<COMPONENT type="1010" id="613" >
 <cdparam x="247" y="468" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="send_TCP() " />
-<TGConnectingPoint num="0" id="650" />
-<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="0" id="611" />
+<TGConnectingPoint num="1" id="612" />
 <extraparam>
 <Data eventName="send_TCP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="655" >
+<COMPONENT type="1010" id="616" >
 <cdparam x="160" y="419" />
 <sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="open() " />
-<TGConnectingPoint num="0" id="653" />
-<TGConnectingPoint num="1" id="654" />
+<TGConnectingPoint num="0" id="614" />
+<TGConnectingPoint num="1" id="615" />
 <breakpoint />
 <extraparam>
 <Data eventName="open" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1018" id="666" >
+<COMPONENT type="1018" id="627" >
 <cdparam x="449" y="267" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="select" value="null" />
-<TGConnectingPoint num="0" id="656" />
-<TGConnectingPoint num="1" id="657" />
-<TGConnectingPoint num="2" id="658" />
-<TGConnectingPoint num="3" id="659" />
-<TGConnectingPoint num="4" id="660" />
-<TGConnectingPoint num="5" id="661" />
-<TGConnectingPoint num="6" id="662" />
-<TGConnectingPoint num="7" id="663" />
-<TGConnectingPoint num="8" id="664" />
-<TGConnectingPoint num="9" id="665" />
+<TGConnectingPoint num="0" id="617" />
+<TGConnectingPoint num="1" id="618" />
+<TGConnectingPoint num="2" id="619" />
+<TGConnectingPoint num="3" id="620" />
+<TGConnectingPoint num="4" id="621" />
+<TGConnectingPoint num="5" id="622" />
+<TGConnectingPoint num="6" id="623" />
+<TGConnectingPoint num="7" id="624" />
+<TGConnectingPoint num="8" id="625" />
+<TGConnectingPoint num="9" id="626" />
 <breakpoint />
 </COMPONENT>
 
-<COMPONENT type="1001" id="668" >
+<COMPONENT type="1001" id="629" >
 <cdparam x="226" y="529" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="667" />
+<TGConnectingPoint num="0" id="628" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="670" >
+<COMPONENT type="1001" id="631" >
 <cdparam x="343" y="614" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="669" />
+<TGConnectingPoint num="0" id="630" />
 </COMPONENT>
 
-<COMPONENT type="1010" id="673" >
+<COMPONENT type="1010" id="634" >
 <cdparam x="272" y="228" />
 <sizeparam width="58" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="wait event" value="abort() " />
-<TGConnectingPoint num="0" id="671" />
-<TGConnectingPoint num="1" id="672" />
+<TGConnectingPoint num="0" id="632" />
+<TGConnectingPoint num="1" id="633" />
 <extraparam>
 <Data eventName="abort" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="675" >
+<COMPONENT type="1001" id="636" >
 <cdparam x="291" y="290" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="674" />
+<TGConnectingPoint num="0" id="635" />
 </COMPONENT>
 
-<COMPONENT type="301" id="692" >
+<COMPONENT type="301" id="653" >
 <cdparam x="602" y="86" />
 <sizeparam width="393" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -3256,22 +3134,22 @@ ou depaquitiser un paquet TCP
 
 On prend b=1 comme exemple
 " />
-<TGConnectingPoint num="0" id="676" />
-<TGConnectingPoint num="1" id="677" />
-<TGConnectingPoint num="2" id="678" />
-<TGConnectingPoint num="3" id="679" />
-<TGConnectingPoint num="4" id="680" />
-<TGConnectingPoint num="5" id="681" />
-<TGConnectingPoint num="6" id="682" />
-<TGConnectingPoint num="7" id="683" />
-<TGConnectingPoint num="8" id="684" />
-<TGConnectingPoint num="9" id="685" />
-<TGConnectingPoint num="10" id="686" />
-<TGConnectingPoint num="11" id="687" />
-<TGConnectingPoint num="12" id="688" />
-<TGConnectingPoint num="13" id="689" />
-<TGConnectingPoint num="14" id="690" />
-<TGConnectingPoint num="15" id="691" />
+<TGConnectingPoint num="0" id="637" />
+<TGConnectingPoint num="1" id="638" />
+<TGConnectingPoint num="2" id="639" />
+<TGConnectingPoint num="3" id="640" />
+<TGConnectingPoint num="4" id="641" />
+<TGConnectingPoint num="5" id="642" />
+<TGConnectingPoint num="6" id="643" />
+<TGConnectingPoint num="7" id="644" />
+<TGConnectingPoint num="8" id="645" />
+<TGConnectingPoint num="9" id="646" />
+<TGConnectingPoint num="10" id="647" />
+<TGConnectingPoint num="11" id="648" />
+<TGConnectingPoint num="12" id="649" />
+<TGConnectingPoint num="13" id="650" />
+<TGConnectingPoint num="14" id="651" />
+<TGConnectingPoint num="15" id="652" />
 <extraparam>
 <Line value="b est le nombre d&apos;instructions necessaires pour paquetiser" />
 <Line value="ou depaquitiser un paquet TCP" />
@@ -3280,2830 +3158,2957 @@ On prend b=1 comme exemple
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="695" >
+<COMPONENT type="1009" id="656" >
 <cdparam x="186" y="808" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="fromAtoT(1) " />
-<TGConnectingPoint num="0" id="693" />
-<TGConnectingPoint num="1" id="694" />
+<TGConnectingPoint num="0" id="654" />
+<TGConnectingPoint num="1" id="655" />
 <extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" />
+<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="698" >
+<COMPONENT type="1006" id="659" >
 <cdparam x="188" y="1002" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="696" />
-<TGConnectingPoint num="1" id="697" />
+<TGConnectingPoint num="0" id="657" />
+<TGConnectingPoint num="1" id="658" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="700" >
+<COMPONENT type="1001" id="661" >
 <cdparam x="219" y="1237" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="699" />
+<TGConnectingPoint num="0" id="660" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="703" >
+<COMPONENT type="1011" id="664" >
 <cdparam x="384" y="1032" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =5" />
-<TGConnectingPoint num="0" id="701" />
-<TGConnectingPoint num="1" id="702" />
+<TGConnectingPoint num="0" id="662" />
+<TGConnectingPoint num="1" id="663" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="705" >
+<COMPONENT type="1001" id="666" >
 <cdparam x="428" y="1213" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="704" />
+<TGConnectingPoint num="0" id="665" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="708" >
+<COMPONENT type="1011" id="669" >
 <cdparam x="80" y="1041" />
 <sizeparam width="105" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state=3" />
-<TGConnectingPoint num="0" id="706" />
-<TGConnectingPoint num="1" id="707" />
+<TGConnectingPoint num="0" id="667" />
+<TGConnectingPoint num="1" id="668" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="711" >
+<COMPONENT type="1006" id="672" >
 <cdparam x="90" y="938" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="709" />
-<TGConnectingPoint num="1" id="710" />
+<TGConnectingPoint num="0" id="670" />
+<TGConnectingPoint num="1" id="671" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="714" >
+<COMPONENT type="1011" id="675" >
 <cdparam x="288" y="1026" />
 <sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =10" />
-<TGConnectingPoint num="0" id="712" />
-<TGConnectingPoint num="1" id="713" />
+<TGConnectingPoint num="0" id="673" />
+<TGConnectingPoint num="1" id="674" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="716" >
+<COMPONENT type="1001" id="677" >
 <cdparam x="334" y="1229" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="715" />
+<TGConnectingPoint num="0" id="676" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="719" >
+<COMPONENT type="1006" id="680" >
 <cdparam x="397" y="941" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="717" />
-<TGConnectingPoint num="1" id="718" />
+<TGConnectingPoint num="0" id="678" />
+<TGConnectingPoint num="1" id="679" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="722" >
+<COMPONENT type="1006" id="683" >
 <cdparam x="304" y="900" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="720" />
-<TGConnectingPoint num="1" id="721" />
+<TGConnectingPoint num="0" id="681" />
+<TGConnectingPoint num="1" id="682" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="724" >
+<COMPONENT type="1001" id="685" >
 <cdparam x="789" y="1270" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="723" />
+<TGConnectingPoint num="0" id="684" />
 </COMPONENT>
 
-<COMPONENT type="301" id="741" >
+<COMPONENT type="301" id="702" >
 <cdparam x="998" y="850" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Fin
 " />
-<TGConnectingPoint num="0" id="725" />
-<TGConnectingPoint num="1" id="726" />
-<TGConnectingPoint num="2" id="727" />
-<TGConnectingPoint num="3" id="728" />
-<TGConnectingPoint num="4" id="729" />
-<TGConnectingPoint num="5" id="730" />
-<TGConnectingPoint num="6" id="731" />
-<TGConnectingPoint num="7" id="732" />
-<TGConnectingPoint num="8" id="733" />
-<TGConnectingPoint num="9" id="734" />
-<TGConnectingPoint num="10" id="735" />
-<TGConnectingPoint num="11" id="736" />
-<TGConnectingPoint num="12" id="737" />
-<TGConnectingPoint num="13" id="738" />
-<TGConnectingPoint num="14" id="739" />
-<TGConnectingPoint num="15" id="740" />
+<TGConnectingPoint num="0" id="686" />
+<TGConnectingPoint num="1" id="687" />
+<TGConnectingPoint num="2" id="688" />
+<TGConnectingPoint num="3" id="689" />
+<TGConnectingPoint num="4" id="690" />
+<TGConnectingPoint num="5" id="691" />
+<TGConnectingPoint num="6" id="692" />
+<TGConnectingPoint num="7" id="693" />
+<TGConnectingPoint num="8" id="694" />
+<TGConnectingPoint num="9" id="695" />
+<TGConnectingPoint num="10" id="696" />
+<TGConnectingPoint num="11" id="697" />
+<TGConnectingPoint num="12" id="698" />
+<TGConnectingPoint num="13" id="699" />
+<TGConnectingPoint num="14" id="700" />
+<TGConnectingPoint num="15" id="701" />
 <extraparam>
 <Line value="Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="744" >
+<COMPONENT type="1011" id="705" >
 <cdparam x="674" y="965" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =1" />
-<TGConnectingPoint num="0" id="742" />
-<TGConnectingPoint num="1" id="743" />
+<TGConnectingPoint num="0" id="703" />
+<TGConnectingPoint num="1" id="704" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="746" >
+<COMPONENT type="1001" id="707" >
 <cdparam x="718" y="1032" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="745" />
+<TGConnectingPoint num="0" id="706" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="749" >
+<COMPONENT type="1006" id="710" >
 <cdparam x="758" y="1086" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="747" />
-<TGConnectingPoint num="1" id="748" />
+<TGConnectingPoint num="0" id="708" />
+<TGConnectingPoint num="1" id="709" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="766" >
+<COMPONENT type="301" id="727" >
 <cdparam x="781" y="950" />
 <sizeparam width="94" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Active Open
 " />
-<TGConnectingPoint num="0" id="750" />
-<TGConnectingPoint num="1" id="751" />
-<TGConnectingPoint num="2" id="752" />
-<TGConnectingPoint num="3" id="753" />
-<TGConnectingPoint num="4" id="754" />
-<TGConnectingPoint num="5" id="755" />
-<TGConnectingPoint num="6" id="756" />
-<TGConnectingPoint num="7" id="757" />
-<TGConnectingPoint num="8" id="758" />
-<TGConnectingPoint num="9" id="759" />
-<TGConnectingPoint num="10" id="760" />
-<TGConnectingPoint num="11" id="761" />
-<TGConnectingPoint num="12" id="762" />
-<TGConnectingPoint num="13" id="763" />
-<TGConnectingPoint num="14" id="764" />
-<TGConnectingPoint num="15" id="765" />
+<TGConnectingPoint num="0" id="711" />
+<TGConnectingPoint num="1" id="712" />
+<TGConnectingPoint num="2" id="713" />
+<TGConnectingPoint num="3" id="714" />
+<TGConnectingPoint num="4" id="715" />
+<TGConnectingPoint num="5" id="716" />
+<TGConnectingPoint num="6" id="717" />
+<TGConnectingPoint num="7" id="718" />
+<TGConnectingPoint num="8" id="719" />
+<TGConnectingPoint num="9" id="720" />
+<TGConnectingPoint num="10" id="721" />
+<TGConnectingPoint num="11" id="722" />
+<TGConnectingPoint num="12" id="723" />
+<TGConnectingPoint num="13" id="724" />
+<TGConnectingPoint num="14" id="725" />
+<TGConnectingPoint num="15" id="726" />
 <extraparam>
 <Line value="Active Open" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="783" >
+<COMPONENT type="301" id="744" >
 <cdparam x="715" y="907" />
 <sizeparam width="104" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Passive Open
 " />
-<TGConnectingPoint num="0" id="767" />
-<TGConnectingPoint num="1" id="768" />
-<TGConnectingPoint num="2" id="769" />
-<TGConnectingPoint num="3" id="770" />
-<TGConnectingPoint num="4" id="771" />
-<TGConnectingPoint num="5" id="772" />
-<TGConnectingPoint num="6" id="773" />
-<TGConnectingPoint num="7" id="774" />
-<TGConnectingPoint num="8" id="775" />
-<TGConnectingPoint num="9" id="776" />
-<TGConnectingPoint num="10" id="777" />
-<TGConnectingPoint num="11" id="778" />
-<TGConnectingPoint num="12" id="779" />
-<TGConnectingPoint num="13" id="780" />
-<TGConnectingPoint num="14" id="781" />
-<TGConnectingPoint num="15" id="782" />
+<TGConnectingPoint num="0" id="728" />
+<TGConnectingPoint num="1" id="729" />
+<TGConnectingPoint num="2" id="730" />
+<TGConnectingPoint num="3" id="731" />
+<TGConnectingPoint num="4" id="732" />
+<TGConnectingPoint num="5" id="733" />
+<TGConnectingPoint num="6" id="734" />
+<TGConnectingPoint num="7" id="735" />
+<TGConnectingPoint num="8" id="736" />
+<TGConnectingPoint num="9" id="737" />
+<TGConnectingPoint num="10" id="738" />
+<TGConnectingPoint num="11" id="739" />
+<TGConnectingPoint num="12" id="740" />
+<TGConnectingPoint num="13" id="741" />
+<TGConnectingPoint num="14" id="742" />
+<TGConnectingPoint num="15" id="743" />
 <extraparam>
 <Line value="Passive Open" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="786" >
+<COMPONENT type="1011" id="747" >
 <cdparam x="745" y="1193" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =3" />
-<TGConnectingPoint num="0" id="784" />
-<TGConnectingPoint num="1" id="785" />
+<TGConnectingPoint num="0" id="745" />
+<TGConnectingPoint num="1" id="746" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="789" >
+<COMPONENT type="1011" id="750" >
 <cdparam x="442" y="768" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="787" />
-<TGConnectingPoint num="1" id="788" />
+<TGConnectingPoint num="0" id="748" />
+<TGConnectingPoint num="1" id="749" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="791" >
+<COMPONENT type="1001" id="752" >
 <cdparam x="486" y="830" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="790" />
+<TGConnectingPoint num="0" id="751" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="794" >
+<COMPONENT type="1006" id="755" >
 <cdparam x="901" y="1123" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="792" />
-<TGConnectingPoint num="1" id="793" />
+<TGConnectingPoint num="0" id="753" />
+<TGConnectingPoint num="1" id="754" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="811" >
+<COMPONENT type="301" id="772" >
 <cdparam x="884" y="1068" />
 <sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="795" />
-<TGConnectingPoint num="1" id="796" />
-<TGConnectingPoint num="2" id="797" />
-<TGConnectingPoint num="3" id="798" />
-<TGConnectingPoint num="4" id="799" />
-<TGConnectingPoint num="5" id="800" />
-<TGConnectingPoint num="6" id="801" />
-<TGConnectingPoint num="7" id="802" />
-<TGConnectingPoint num="8" id="803" />
-<TGConnectingPoint num="9" id="804" />
-<TGConnectingPoint num="10" id="805" />
-<TGConnectingPoint num="11" id="806" />
-<TGConnectingPoint num="12" id="807" />
-<TGConnectingPoint num="13" id="808" />
-<TGConnectingPoint num="14" id="809" />
-<TGConnectingPoint num="15" id="810" />
+<TGConnectingPoint num="0" id="756" />
+<TGConnectingPoint num="1" id="757" />
+<TGConnectingPoint num="2" id="758" />
+<TGConnectingPoint num="3" id="759" />
+<TGConnectingPoint num="4" id="760" />
+<TGConnectingPoint num="5" id="761" />
+<TGConnectingPoint num="6" id="762" />
+<TGConnectingPoint num="7" id="763" />
+<TGConnectingPoint num="8" id="764" />
+<TGConnectingPoint num="9" id="765" />
+<TGConnectingPoint num="10" id="766" />
+<TGConnectingPoint num="11" id="767" />
+<TGConnectingPoint num="12" id="768" />
+<TGConnectingPoint num="13" id="769" />
+<TGConnectingPoint num="14" id="770" />
+<TGConnectingPoint num="15" id="771" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="814" >
+<COMPONENT type="1011" id="775" >
 <cdparam x="889" y="1234" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =9" />
-<TGConnectingPoint num="0" id="812" />
-<TGConnectingPoint num="1" id="813" />
+<TGConnectingPoint num="0" id="773" />
+<TGConnectingPoint num="1" id="774" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="816" >
+<COMPONENT type="1001" id="777" >
 <cdparam x="933" y="1311" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="815" />
+<TGConnectingPoint num="0" id="776" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="819" >
+<COMPONENT type="1006" id="780" >
 <cdparam x="1007" y="1155" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="817" />
-<TGConnectingPoint num="1" id="818" />
+<TGConnectingPoint num="0" id="778" />
+<TGConnectingPoint num="1" id="779" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="836" >
+<COMPONENT type="301" id="797" >
 <cdparam x="1000" y="1094" />
 <sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="820" />
-<TGConnectingPoint num="1" id="821" />
-<TGConnectingPoint num="2" id="822" />
-<TGConnectingPoint num="3" id="823" />
-<TGConnectingPoint num="4" id="824" />
-<TGConnectingPoint num="5" id="825" />
-<TGConnectingPoint num="6" id="826" />
-<TGConnectingPoint num="7" id="827" />
-<TGConnectingPoint num="8" id="828" />
-<TGConnectingPoint num="9" id="829" />
-<TGConnectingPoint num="10" id="830" />
-<TGConnectingPoint num="11" id="831" />
-<TGConnectingPoint num="12" id="832" />
-<TGConnectingPoint num="13" id="833" />
-<TGConnectingPoint num="14" id="834" />
-<TGConnectingPoint num="15" id="835" />
+<TGConnectingPoint num="0" id="781" />
+<TGConnectingPoint num="1" id="782" />
+<TGConnectingPoint num="2" id="783" />
+<TGConnectingPoint num="3" id="784" />
+<TGConnectingPoint num="4" id="785" />
+<TGConnectingPoint num="5" id="786" />
+<TGConnectingPoint num="6" id="787" />
+<TGConnectingPoint num="7" id="788" />
+<TGConnectingPoint num="8" id="789" />
+<TGConnectingPoint num="9" id="790" />
+<TGConnectingPoint num="10" id="791" />
+<TGConnectingPoint num="11" id="792" />
+<TGConnectingPoint num="12" id="793" />
+<TGConnectingPoint num="13" id="794" />
+<TGConnectingPoint num="14" id="795" />
+<TGConnectingPoint num="15" id="796" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="839" >
+<COMPONENT type="1011" id="800" >
 <cdparam x="995" y="1266" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =7" />
-<TGConnectingPoint num="0" id="837" />
-<TGConnectingPoint num="1" id="838" />
+<TGConnectingPoint num="0" id="798" />
+<TGConnectingPoint num="1" id="799" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="841" >
+<COMPONENT type="1001" id="802" >
 <cdparam x="1039" y="1341" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="840" />
+<TGConnectingPoint num="0" id="801" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="844" >
+<COMPONENT type="1006" id="805" >
 <cdparam x="680" y="758" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="842" />
-<TGConnectingPoint num="1" id="843" />
+<TGConnectingPoint num="0" id="803" />
+<TGConnectingPoint num="1" id="804" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="846" >
+<COMPONENT type="1001" id="807" >
 <cdparam x="712" y="865" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="845" />
+<TGConnectingPoint num="0" id="806" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="849" >
+<COMPONENT type="1007" id="810" >
 <cdparam x="92" y="1100" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="847" />
-<TGConnectingPoint num="1" id="848" />
+<TGConnectingPoint num="0" id="808" />
+<TGConnectingPoint num="1" id="809" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="852" >
+<COMPONENT type="1006" id="813" >
 <cdparam x="102" y="1167" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="850" />
-<TGConnectingPoint num="1" id="851" />
+<TGConnectingPoint num="0" id="811" />
+<TGConnectingPoint num="1" id="812" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="854" >
+<COMPONENT type="1001" id="815" >
 <cdparam x="122" y="1236" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="853" />
+<TGConnectingPoint num="0" id="814" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="857" >
+<COMPONENT type="1007" id="818" >
 <cdparam x="189" y="1102" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="855" />
-<TGConnectingPoint num="1" id="856" />
+<TGConnectingPoint num="0" id="816" />
+<TGConnectingPoint num="1" id="817" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="860" >
+<COMPONENT type="1006" id="821" >
 <cdparam x="199" y="1169" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="858" />
-<TGConnectingPoint num="1" id="859" />
+<TGConnectingPoint num="0" id="819" />
+<TGConnectingPoint num="1" id="820" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="863" >
+<COMPONENT type="1007" id="824" >
 <cdparam x="306" y="1106" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="861" />
-<TGConnectingPoint num="1" id="862" />
+<TGConnectingPoint num="0" id="822" />
+<TGConnectingPoint num="1" id="823" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="866" >
+<COMPONENT type="1006" id="827" >
 <cdparam x="316" y="1173" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="864" />
-<TGConnectingPoint num="1" id="865" />
+<TGConnectingPoint num="0" id="825" />
+<TGConnectingPoint num="1" id="826" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1007" id="869" >
+<COMPONENT type="1007" id="830" >
 <cdparam x="398" y="1090" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
+<TGConnectingPoint num="0" id="828" />
+<TGConnectingPoint num="1" id="829" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="872" >
+<COMPONENT type="1006" id="833" >
 <cdparam x="408" y="1159" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="870" />
-<TGConnectingPoint num="1" id="871" />
+<TGConnectingPoint num="0" id="831" />
+<TGConnectingPoint num="1" id="832" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="875" >
+<COMPONENT type="1011" id="836" >
 <cdparam x="52" y="861" />
 <sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="873" />
-<TGConnectingPoint num="1" id="874" />
+<TGConnectingPoint num="0" id="834" />
+<TGConnectingPoint num="1" id="835" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="878" >
+<COMPONENT type="1011" id="839" >
 <cdparam x="150" y="940" />
 <sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="876" />
-<TGConnectingPoint num="1" id="877" />
+<TGConnectingPoint num="0" id="837" />
+<TGConnectingPoint num="1" id="838" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="881" >
+<COMPONENT type="1011" id="842" >
 <cdparam x="359" y="865" />
 <sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="879" />
-<TGConnectingPoint num="1" id="880" />
+<TGConnectingPoint num="0" id="840" />
+<TGConnectingPoint num="1" id="841" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="884" >
+<COMPONENT type="1011" id="845" >
 <cdparam x="266" y="831" />
 <sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="882" />
-<TGConnectingPoint num="1" id="883" />
+<TGConnectingPoint num="0" id="843" />
+<TGConnectingPoint num="1" id="844" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="887" >
+<COMPONENT type="1008" id="848" >
 <cdparam x="204" y="1052" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="885" />
-<TGConnectingPoint num="1" id="886" />
+<TGConnectingPoint num="0" id="846" />
+<TGConnectingPoint num="1" id="847" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="890" >
+<COMPONENT type="1008" id="851" >
 <cdparam x="321" y="962" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="888" />
-<TGConnectingPoint num="1" id="889" />
+<TGConnectingPoint num="0" id="849" />
+<TGConnectingPoint num="1" id="850" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="893" >
+<COMPONENT type="1008" id="854" >
 <cdparam x="413" y="983" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="891" />
-<TGConnectingPoint num="1" id="892" />
+<TGConnectingPoint num="0" id="852" />
+<TGConnectingPoint num="1" id="853" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="896" >
+<COMPONENT type="1008" id="857" >
 <cdparam x="107" y="986" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="894" />
-<TGConnectingPoint num="1" id="895" />
+<TGConnectingPoint num="0" id="855" />
+<TGConnectingPoint num="1" id="856" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="899" >
+<COMPONENT type="1008" id="860" >
 <cdparam x="697" y="813" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="897" />
-<TGConnectingPoint num="1" id="898" />
+<TGConnectingPoint num="0" id="858" />
+<TGConnectingPoint num="1" id="859" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="902" >
+<COMPONENT type="1008" id="863" >
 <cdparam x="773" y="1141" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="900" />
-<TGConnectingPoint num="1" id="901" />
+<TGConnectingPoint num="0" id="861" />
+<TGConnectingPoint num="1" id="862" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="905" >
+<COMPONENT type="1008" id="866" >
 <cdparam x="918" y="1178" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="903" />
-<TGConnectingPoint num="1" id="904" />
+<TGConnectingPoint num="0" id="864" />
+<TGConnectingPoint num="1" id="865" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="908" >
+<COMPONENT type="1008" id="869" >
 <cdparam x="1024" y="1211" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="906" />
-<TGConnectingPoint num="1" id="907" />
+<TGConnectingPoint num="0" id="867" />
+<TGConnectingPoint num="1" id="868" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="910" >
+<COMPONENT type="1001" id="871" >
 <cdparam x="612" y="762" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="909" />
+<TGConnectingPoint num="0" id="870" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="912" >
+<COMPONENT type="1001" id="873" >
 <cdparam x="899" y="922" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="911" />
+<TGConnectingPoint num="0" id="872" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="915" >
+<COMPONENT type="1006" id="876" >
 <cdparam x="1166" y="1214" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="913" />
-<TGConnectingPoint num="1" id="914" />
+<TGConnectingPoint num="0" id="874" />
+<TGConnectingPoint num="1" id="875" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="932" >
+<COMPONENT type="301" id="893" >
 <cdparam x="1159" y="1153" />
 <sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of Fin
 " />
-<TGConnectingPoint num="0" id="916" />
-<TGConnectingPoint num="1" id="917" />
-<TGConnectingPoint num="2" id="918" />
-<TGConnectingPoint num="3" id="919" />
-<TGConnectingPoint num="4" id="920" />
-<TGConnectingPoint num="5" id="921" />
-<TGConnectingPoint num="6" id="922" />
-<TGConnectingPoint num="7" id="923" />
-<TGConnectingPoint num="8" id="924" />
-<TGConnectingPoint num="9" id="925" />
-<TGConnectingPoint num="10" id="926" />
-<TGConnectingPoint num="11" id="927" />
-<TGConnectingPoint num="12" id="928" />
-<TGConnectingPoint num="13" id="929" />
-<TGConnectingPoint num="14" id="930" />
-<TGConnectingPoint num="15" id="931" />
+<TGConnectingPoint num="0" id="877" />
+<TGConnectingPoint num="1" id="878" />
+<TGConnectingPoint num="2" id="879" />
+<TGConnectingPoint num="3" id="880" />
+<TGConnectingPoint num="4" id="881" />
+<TGConnectingPoint num="5" id="882" />
+<TGConnectingPoint num="6" id="883" />
+<TGConnectingPoint num="7" id="884" />
+<TGConnectingPoint num="8" id="885" />
+<TGConnectingPoint num="9" id="886" />
+<TGConnectingPoint num="10" id="887" />
+<TGConnectingPoint num="11" id="888" />
+<TGConnectingPoint num="12" id="889" />
+<TGConnectingPoint num="13" id="890" />
+<TGConnectingPoint num="14" id="891" />
+<TGConnectingPoint num="15" id="892" />
 <extraparam>
 <Line value="send Ack of Fin" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="935" >
+<COMPONENT type="1011" id="896" >
 <cdparam x="1154" y="1295" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="933" />
-<TGConnectingPoint num="1" id="934" />
+<TGConnectingPoint num="0" id="894" />
+<TGConnectingPoint num="1" id="895" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="937" >
+<COMPONENT type="1001" id="898" >
 <cdparam x="1197" y="1471" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="936" />
+<TGConnectingPoint num="0" id="897" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="940" >
+<COMPONENT type="1011" id="901" >
 <cdparam x="1153" y="1402" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="938" />
-<TGConnectingPoint num="1" id="939" />
+<TGConnectingPoint num="0" id="899" />
+<TGConnectingPoint num="1" id="900" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="943" >
+<COMPONENT type="1008" id="904" >
 <cdparam x="1183" y="1351" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="941" />
-<TGConnectingPoint num="1" id="942" />
+<TGConnectingPoint num="0" id="902" />
+<TGConnectingPoint num="1" id="903" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="945" >
+<COMPONENT type="1001" id="906" >
 <cdparam x="1277" y="1070" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="944" />
+<TGConnectingPoint num="0" id="905" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="947" >
+<COMPONENT type="1001" id="908" >
 <cdparam x="1519" y="1457" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="946" />
+<TGConnectingPoint num="0" id="907" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="950" >
+<COMPONENT type="1006" id="911" >
 <cdparam x="1487" y="1132" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoA(1)" />
-<TGConnectingPoint num="0" id="948" />
-<TGConnectingPoint num="1" id="949" />
+<TGConnectingPoint num="0" id="909" />
+<TGConnectingPoint num="1" id="910" />
 <extraparam>
-<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoA" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="953" >
+<COMPONENT type="1006" id="914" >
 <cdparam x="1487" y="1348" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="951" />
-<TGConnectingPoint num="1" id="952" />
+<TGConnectingPoint num="0" id="912" />
+<TGConnectingPoint num="1" id="913" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="956" >
+<COMPONENT type="1008" id="917" >
 <cdparam x="1707" y="1026" />
 <sizeparam width="48" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="stop()" />
-<TGConnectingPoint num="0" id="954" />
-<TGConnectingPoint num="1" id="955" />
+<TGConnectingPoint num="0" id="915" />
+<TGConnectingPoint num="1" id="916" />
 <extraparam>
 <Data eventName="stop" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="973" >
+<COMPONENT type="301" id="934" >
 <cdparam x="1759" y="1192" />
 <sizeparam width="92" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Correct ack
 " />
-<TGConnectingPoint num="0" id="957" />
-<TGConnectingPoint num="1" id="958" />
-<TGConnectingPoint num="2" id="959" />
-<TGConnectingPoint num="3" id="960" />
-<TGConnectingPoint num="4" id="961" />
-<TGConnectingPoint num="5" id="962" />
-<TGConnectingPoint num="6" id="963" />
-<TGConnectingPoint num="7" id="964" />
-<TGConnectingPoint num="8" id="965" />
-<TGConnectingPoint num="9" id="966" />
-<TGConnectingPoint num="10" id="967" />
-<TGConnectingPoint num="11" id="968" />
-<TGConnectingPoint num="12" id="969" />
-<TGConnectingPoint num="13" id="970" />
-<TGConnectingPoint num="14" id="971" />
-<TGConnectingPoint num="15" id="972" />
+<TGConnectingPoint num="0" id="918" />
+<TGConnectingPoint num="1" id="919" />
+<TGConnectingPoint num="2" id="920" />
+<TGConnectingPoint num="3" id="921" />
+<TGConnectingPoint num="4" id="922" />
+<TGConnectingPoint num="5" id="923" />
+<TGConnectingPoint num="6" id="924" />
+<TGConnectingPoint num="7" id="925" />
+<TGConnectingPoint num="8" id="926" />
+<TGConnectingPoint num="9" id="927" />
+<TGConnectingPoint num="10" id="928" />
+<TGConnectingPoint num="11" id="929" />
+<TGConnectingPoint num="12" id="930" />
+<TGConnectingPoint num="13" id="931" />
+<TGConnectingPoint num="14" id="932" />
+<TGConnectingPoint num="15" id="933" />
 <extraparam>
 <Line value="Correct ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="990" >
+<COMPONENT type="301" id="951" >
 <cdparam x="1635" y="1168" />
 <sizeparam width="76" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="false ack
 " />
-<TGConnectingPoint num="0" id="974" />
-<TGConnectingPoint num="1" id="975" />
-<TGConnectingPoint num="2" id="976" />
-<TGConnectingPoint num="3" id="977" />
-<TGConnectingPoint num="4" id="978" />
-<TGConnectingPoint num="5" id="979" />
-<TGConnectingPoint num="6" id="980" />
-<TGConnectingPoint num="7" id="981" />
-<TGConnectingPoint num="8" id="982" />
-<TGConnectingPoint num="9" id="983" />
-<TGConnectingPoint num="10" id="984" />
-<TGConnectingPoint num="11" id="985" />
-<TGConnectingPoint num="12" id="986" />
-<TGConnectingPoint num="13" id="987" />
-<TGConnectingPoint num="14" id="988" />
-<TGConnectingPoint num="15" id="989" />
+<TGConnectingPoint num="0" id="935" />
+<TGConnectingPoint num="1" id="936" />
+<TGConnectingPoint num="2" id="937" />
+<TGConnectingPoint num="3" id="938" />
+<TGConnectingPoint num="4" id="939" />
+<TGConnectingPoint num="5" id="940" />
+<TGConnectingPoint num="6" id="941" />
+<TGConnectingPoint num="7" id="942" />
+<TGConnectingPoint num="8" id="943" />
+<TGConnectingPoint num="9" id="944" />
+<TGConnectingPoint num="10" id="945" />
+<TGConnectingPoint num="11" id="946" />
+<TGConnectingPoint num="12" id="947" />
+<TGConnectingPoint num="13" id="948" />
+<TGConnectingPoint num="14" id="949" />
+<TGConnectingPoint num="15" id="950" />
 <extraparam>
 <Line value="false ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="993" >
+<COMPONENT type="1006" id="954" >
 <cdparam x="1599" y="1299" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="991" />
-<TGConnectingPoint num="1" id="992" />
+<TGConnectingPoint num="0" id="952" />
+<TGConnectingPoint num="1" id="953" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="995" >
+<COMPONENT type="1001" id="956" >
 <cdparam x="1632" y="1468" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="994" />
+<TGConnectingPoint num="0" id="955" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1012" >
+<COMPONENT type="301" id="973" >
 <cdparam x="1469" y="1295" />
 <sizeparam width="137" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="return acknowldge
 " />
-<TGConnectingPoint num="0" id="996" />
-<TGConnectingPoint num="1" id="997" />
-<TGConnectingPoint num="2" id="998" />
-<TGConnectingPoint num="3" id="999" />
-<TGConnectingPoint num="4" id="1000" />
-<TGConnectingPoint num="5" id="1001" />
-<TGConnectingPoint num="6" id="1002" />
-<TGConnectingPoint num="7" id="1003" />
-<TGConnectingPoint num="8" id="1004" />
-<TGConnectingPoint num="9" id="1005" />
-<TGConnectingPoint num="10" id="1006" />
-<TGConnectingPoint num="11" id="1007" />
-<TGConnectingPoint num="12" id="1008" />
-<TGConnectingPoint num="13" id="1009" />
-<TGConnectingPoint num="14" id="1010" />
-<TGConnectingPoint num="15" id="1011" />
+<TGConnectingPoint num="0" id="957" />
+<TGConnectingPoint num="1" id="958" />
+<TGConnectingPoint num="2" id="959" />
+<TGConnectingPoint num="3" id="960" />
+<TGConnectingPoint num="4" id="961" />
+<TGConnectingPoint num="5" id="962" />
+<TGConnectingPoint num="6" id="963" />
+<TGConnectingPoint num="7" id="964" />
+<TGConnectingPoint num="8" id="965" />
+<TGConnectingPoint num="9" id="966" />
+<TGConnectingPoint num="10" id="967" />
+<TGConnectingPoint num="11" id="968" />
+<TGConnectingPoint num="12" id="969" />
+<TGConnectingPoint num="13" id="970" />
+<TGConnectingPoint num="14" id="971" />
+<TGConnectingPoint num="15" id="972" />
 <extraparam>
 <Line value="return acknowldge" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1029" >
+<COMPONENT type="301" id="990" >
 <cdparam x="1620" y="927" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="data
 " />
-<TGConnectingPoint num="0" id="1013" />
-<TGConnectingPoint num="1" id="1014" />
-<TGConnectingPoint num="2" id="1015" />
-<TGConnectingPoint num="3" id="1016" />
-<TGConnectingPoint num="4" id="1017" />
-<TGConnectingPoint num="5" id="1018" />
-<TGConnectingPoint num="6" id="1019" />
-<TGConnectingPoint num="7" id="1020" />
-<TGConnectingPoint num="8" id="1021" />
-<TGConnectingPoint num="9" id="1022" />
-<TGConnectingPoint num="10" id="1023" />
-<TGConnectingPoint num="11" id="1024" />
-<TGConnectingPoint num="12" id="1025" />
-<TGConnectingPoint num="13" id="1026" />
-<TGConnectingPoint num="14" id="1027" />
-<TGConnectingPoint num="15" id="1028" />
+<TGConnectingPoint num="0" id="974" />
+<TGConnectingPoint num="1" id="975" />
+<TGConnectingPoint num="2" id="976" />
+<TGConnectingPoint num="3" id="977" />
+<TGConnectingPoint num="4" id="978" />
+<TGConnectingPoint num="5" id="979" />
+<TGConnectingPoint num="6" id="980" />
+<TGConnectingPoint num="7" id="981" />
+<TGConnectingPoint num="8" id="982" />
+<TGConnectingPoint num="9" id="983" />
+<TGConnectingPoint num="10" id="984" />
+<TGConnectingPoint num="11" id="985" />
+<TGConnectingPoint num="12" id="986" />
+<TGConnectingPoint num="13" id="987" />
+<TGConnectingPoint num="14" id="988" />
+<TGConnectingPoint num="15" id="989" />
 <extraparam>
 <Line value="data" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1032" >
+<COMPONENT type="1008" id="993" >
 <cdparam x="1504" y="1405" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1030" />
-<TGConnectingPoint num="1" id="1031" />
+<TGConnectingPoint num="0" id="991" />
+<TGConnectingPoint num="1" id="992" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1035" >
+<COMPONENT type="1008" id="996" >
 <cdparam x="1617" y="1348" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1033" />
-<TGConnectingPoint num="1" id="1034" />
+<TGConnectingPoint num="0" id="994" />
+<TGConnectingPoint num="1" id="995" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1038" >
+<COMPONENT type="1006" id="999" >
 <cdparam x="1612" y="1404" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1036" />
-<TGConnectingPoint num="1" id="1037" />
+<TGConnectingPoint num="0" id="997" />
+<TGConnectingPoint num="1" id="998" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1040" >
+<COMPONENT type="1001" id="1001" >
 <cdparam x="1730" y="1335" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1039" />
+<TGConnectingPoint num="0" id="1000" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1043" >
+<COMPONENT type="1011" id="1004" >
 <cdparam x="1772" y="1349" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =4" />
-<TGConnectingPoint num="0" id="1041" />
-<TGConnectingPoint num="1" id="1042" />
+<TGConnectingPoint num="0" id="1002" />
+<TGConnectingPoint num="1" id="1003" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1045" >
+<COMPONENT type="1001" id="1006" >
 <cdparam x="1818" y="1457" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1044" />
+<TGConnectingPoint num="0" id="1005" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1048" >
+<COMPONENT type="1011" id="1009" >
 <cdparam x="1866" y="1411" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =6" />
-<TGConnectingPoint num="0" id="1046" />
-<TGConnectingPoint num="1" id="1047" />
+<TGConnectingPoint num="0" id="1007" />
+<TGConnectingPoint num="1" id="1008" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1050" >
+<COMPONENT type="1001" id="1011" >
 <cdparam x="1910" y="1481" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1049" />
+<TGConnectingPoint num="0" id="1010" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1052" >
+<COMPONENT type="1001" id="1013" >
 <cdparam x="1986" y="1543" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1051" />
+<TGConnectingPoint num="0" id="1012" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1055" >
+<COMPONENT type="1011" id="1016" >
 <cdparam x="2047" y="1466" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1053" />
-<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="0" id="1014" />
+<TGConnectingPoint num="1" id="1015" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1057" >
+<COMPONENT type="1001" id="1018" >
 <cdparam x="2091" y="1537" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1056" />
+<TGConnectingPoint num="0" id="1017" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1060" >
+<COMPONENT type="1011" id="1021" >
 <cdparam x="1942" y="1493" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =0" />
-<TGConnectingPoint num="0" id="1058" />
-<TGConnectingPoint num="1" id="1059" />
+<TGConnectingPoint num="0" id="1019" />
+<TGConnectingPoint num="1" id="1020" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="1063" >
+<COMPONENT type="1011" id="1024" >
 <cdparam x="1942" y="1434" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =8" />
-<TGConnectingPoint num="0" id="1061" />
-<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="0" id="1022" />
+<TGConnectingPoint num="1" id="1023" />
 </COMPONENT>
 
-<COMPONENT type="301" id="1080" >
+<COMPONENT type="301" id="1041" >
 <cdparam x="1825" y="889" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="Syn
 " />
-<TGConnectingPoint num="0" id="1064" />
-<TGConnectingPoint num="1" id="1065" />
-<TGConnectingPoint num="2" id="1066" />
-<TGConnectingPoint num="3" id="1067" />
-<TGConnectingPoint num="4" id="1068" />
-<TGConnectingPoint num="5" id="1069" />
-<TGConnectingPoint num="6" id="1070" />
-<TGConnectingPoint num="7" id="1071" />
-<TGConnectingPoint num="8" id="1072" />
-<TGConnectingPoint num="9" id="1073" />
-<TGConnectingPoint num="10" id="1074" />
-<TGConnectingPoint num="11" id="1075" />
-<TGConnectingPoint num="12" id="1076" />
-<TGConnectingPoint num="13" id="1077" />
-<TGConnectingPoint num="14" id="1078" />
-<TGConnectingPoint num="15" id="1079" />
+<TGConnectingPoint num="0" id="1025" />
+<TGConnectingPoint num="1" id="1026" />
+<TGConnectingPoint num="2" id="1027" />
+<TGConnectingPoint num="3" id="1028" />
+<TGConnectingPoint num="4" id="1029" />
+<TGConnectingPoint num="5" id="1030" />
+<TGConnectingPoint num="6" id="1031" />
+<TGConnectingPoint num="7" id="1032" />
+<TGConnectingPoint num="8" id="1033" />
+<TGConnectingPoint num="9" id="1034" />
+<TGConnectingPoint num="10" id="1035" />
+<TGConnectingPoint num="11" id="1036" />
+<TGConnectingPoint num="12" id="1037" />
+<TGConnectingPoint num="13" id="1038" />
+<TGConnectingPoint num="14" id="1039" />
+<TGConnectingPoint num="15" id="1040" />
 <extraparam>
 <Line value="Syn" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1097" >
+<COMPONENT type="301" id="1058" >
 <cdparam x="1707" y="945" />
 <sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="ack
 " />
-<TGConnectingPoint num="0" id="1081" />
-<TGConnectingPoint num="1" id="1082" />
-<TGConnectingPoint num="2" id="1083" />
-<TGConnectingPoint num="3" id="1084" />
-<TGConnectingPoint num="4" id="1085" />
-<TGConnectingPoint num="5" id="1086" />
-<TGConnectingPoint num="6" id="1087" />
-<TGConnectingPoint num="7" id="1088" />
-<TGConnectingPoint num="8" id="1089" />
-<TGConnectingPoint num="9" id="1090" />
-<TGConnectingPoint num="10" id="1091" />
-<TGConnectingPoint num="11" id="1092" />
-<TGConnectingPoint num="12" id="1093" />
-<TGConnectingPoint num="13" id="1094" />
-<TGConnectingPoint num="14" id="1095" />
-<TGConnectingPoint num="15" id="1096" />
+<TGConnectingPoint num="0" id="1042" />
+<TGConnectingPoint num="1" id="1043" />
+<TGConnectingPoint num="2" id="1044" />
+<TGConnectingPoint num="3" id="1045" />
+<TGConnectingPoint num="4" id="1046" />
+<TGConnectingPoint num="5" id="1047" />
+<TGConnectingPoint num="6" id="1048" />
+<TGConnectingPoint num="7" id="1049" />
+<TGConnectingPoint num="8" id="1050" />
+<TGConnectingPoint num="9" id="1051" />
+<TGConnectingPoint num="10" id="1052" />
+<TGConnectingPoint num="11" id="1053" />
+<TGConnectingPoint num="12" id="1054" />
+<TGConnectingPoint num="13" id="1055" />
+<TGConnectingPoint num="14" id="1056" />
+<TGConnectingPoint num="15" id="1057" />
 <extraparam>
 <Line value="ack" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1100" >
+<COMPONENT type="1006" id="1061" >
 <cdparam x="2176" y="1198" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1098" />
-<TGConnectingPoint num="1" id="1099" />
+<TGConnectingPoint num="0" id="1059" />
+<TGConnectingPoint num="1" id="1060" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1102" >
+<COMPONENT type="1001" id="1063" >
 <cdparam x="2207" y="1483" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1101" />
+<TGConnectingPoint num="0" id="1062" />
 </COMPONENT>
 
-<COMPONENT type="1007" id="1105" >
+<COMPONENT type="1007" id="1066" >
 <cdparam x="2177" y="1298" />
 <sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send request" value="req_Timer()" />
-<TGConnectingPoint num="0" id="1103" />
-<TGConnectingPoint num="1" id="1104" />
+<TGConnectingPoint num="0" id="1064" />
+<TGConnectingPoint num="1" id="1065" />
 <extraparam>
 <Data requestName="req_Timer" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1108" >
+<COMPONENT type="1006" id="1069" >
 <cdparam x="2187" y="1365" />
 <sizeparam width="60" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="temp(1)" />
-<TGConnectingPoint num="0" id="1106" />
-<TGConnectingPoint num="1" id="1107" />
+<TGConnectingPoint num="0" id="1067" />
+<TGConnectingPoint num="1" id="1068" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1111" >
+<COMPONENT type="1011" id="1072" >
 <cdparam x="2138" y="1136" />
 <sizeparam width="160" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="seqNum=seqNum+wind" />
-<TGConnectingPoint num="0" id="1109" />
-<TGConnectingPoint num="1" id="1110" />
+<TGConnectingPoint num="0" id="1070" />
+<TGConnectingPoint num="1" id="1071" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1114" >
+<COMPONENT type="1008" id="1075" >
 <cdparam x="2192" y="1248" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1112" />
-<TGConnectingPoint num="1" id="1113" />
+<TGConnectingPoint num="0" id="1073" />
+<TGConnectingPoint num="1" id="1074" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1117" >
+<COMPONENT type="1011" id="1078" >
 <cdparam x="2163" y="1424" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1115" />
-<TGConnectingPoint num="1" id="1116" />
+<TGConnectingPoint num="0" id="1076" />
+<TGConnectingPoint num="1" id="1077" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="1120" >
+<COMPONENT type="1006" id="1081" >
 <cdparam x="2299" y="1122" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="write channel" value="fromTtoP(1)" />
-<TGConnectingPoint num="0" id="1118" />
-<TGConnectingPoint num="1" id="1119" />
+<TGConnectingPoint num="0" id="1079" />
+<TGConnectingPoint num="1" id="1080" />
 <extraparam>
-<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" />
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="1137" >
+<COMPONENT type="301" id="1098" >
 <cdparam x="2283" y="1065" />
 <sizeparam width="121" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="UML Note" value="send Ack of SYN
 " />
-<TGConnectingPoint num="0" id="1121" />
-<TGConnectingPoint num="1" id="1122" />
-<TGConnectingPoint num="2" id="1123" />
-<TGConnectingPoint num="3" id="1124" />
-<TGConnectingPoint num="4" id="1125" />
-<TGConnectingPoint num="5" id="1126" />
-<TGConnectingPoint num="6" id="1127" />
-<TGConnectingPoint num="7" id="1128" />
-<TGConnectingPoint num="8" id="1129" />
-<TGConnectingPoint num="9" id="1130" />
-<TGConnectingPoint num="10" id="1131" />
-<TGConnectingPoint num="11" id="1132" />
-<TGConnectingPoint num="12" id="1133" />
-<TGConnectingPoint num="13" id="1134" />
-<TGConnectingPoint num="14" id="1135" />
-<TGConnectingPoint num="15" id="1136" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
+<TGConnectingPoint num="2" id="1084" />
+<TGConnectingPoint num="3" id="1085" />
+<TGConnectingPoint num="4" id="1086" />
+<TGConnectingPoint num="5" id="1087" />
+<TGConnectingPoint num="6" id="1088" />
+<TGConnectingPoint num="7" id="1089" />
+<TGConnectingPoint num="8" id="1090" />
+<TGConnectingPoint num="9" id="1091" />
+<TGConnectingPoint num="10" id="1092" />
+<TGConnectingPoint num="11" id="1093" />
+<TGConnectingPoint num="12" id="1094" />
+<TGConnectingPoint num="13" id="1095" />
+<TGConnectingPoint num="14" id="1096" />
+<TGConnectingPoint num="15" id="1097" />
 <extraparam>
 <Line value="send Ack of SYN" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="1140" >
+<COMPONENT type="1011" id="1101" >
 <cdparam x="2287" y="1267" />
 <sizeparam width="109" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="action state" value="tcpctrl.state =2" />
-<TGConnectingPoint num="0" id="1138" />
-<TGConnectingPoint num="1" id="1139" />
+<TGConnectingPoint num="0" id="1099" />
+<TGConnectingPoint num="1" id="1100" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1142" >
+<COMPONENT type="1001" id="1103" >
 <cdparam x="2330" y="1324" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1141" />
+<TGConnectingPoint num="0" id="1102" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1145" >
+<COMPONENT type="1008" id="1106" >
 <cdparam x="2316" y="1199" />
 <sizeparam width="51" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="send()" />
-<TGConnectingPoint num="0" id="1143" />
-<TGConnectingPoint num="1" id="1144" />
+<TGConnectingPoint num="0" id="1104" />
+<TGConnectingPoint num="1" id="1105" />
 <extraparam>
 <Data eventName="send" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1147" >
+<COMPONENT type="1001" id="1108" >
 <cdparam x="1649" y="1057" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1146" />
+<TGConnectingPoint num="0" id="1107" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1149" >
+<COMPONENT type="1001" id="1110" >
 <cdparam x="2168" y="1421" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1148" />
+<TGConnectingPoint num="0" id="1109" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="1151" >
+<COMPONENT type="1001" id="1112" >
 <cdparam x="2268" y="1039" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1150" />
+<TGConnectingPoint num="0" id="1111" />
 </COMPONENT>
 
-<COMPONENT type="1008" id="1154" >
+<COMPONENT type="1008" id="1115" >
 <cdparam x="1459" y="1192" />
 <sizeparam width="140" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="send event" value="receive_Application()" />
-<TGConnectingPoint num="0" id="1152" />
-<TGConnectingPoint num="1" id="1153" />
+<TGConnectingPoint num="0" id="1113" />
+<TGConnectingPoint num="1" id="1114" />
 <extraparam>
 <Data eventName="receive_Application" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="1157" >
+<COMPONENT type="1009" id="1118" >
 <cdparam x="1699" y="1086" />
 <sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" />
 <infoparam name="read channel" value="temp(1) " />
-<TGConnectingPoint num="0" id="1155" />
-<TGConnectingPoint num="1" id="1156" />
+<TGConnectingPoint num="0" id="1116" />
+<TGConnectingPoint num="1" id="1117" />
 <extraparam>
-<Data channelName="temp" nbOfSamples="1" secPattern="" />
+<Data channelName="temp" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="1158" >
+<CONNECTOR type="115" id="1119" >
 <cdparam x="1048" y="795" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1048" y="795" id="548" />
-<P2  x="1728" y="865" id="470" />
+<P1  x="1048" y="795" id="509" />
+<P2  x="1728" y="865" id="431" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1159" >
+<CONNECTOR type="115" id="1120" >
 <cdparam x="1048" y="795" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1089" y="954" id="520" />
-<P2  x="1208" y="1010" id="490" />
+<P1  x="1089" y="954" id="481" />
+<P2  x="1208" y="1010" id="451" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1160" >
+<CONNECTOR type="115" id="1121" >
 <cdparam x="1008" y="610" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="1008" y="610" id="624" />
-<P2  x="1008" y="696" id="552" />
+<P1  x="1008" y="610" id="585" />
+<P2  x="1008" y="696" id="513" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1161" >
+<CONNECTOR type="115" id="1122" >
 <cdparam x="722" y="614" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="722" y="614" id="639" />
-<P2  x="722" y="689" id="508" />
+<P1  x="722" y="614" id="600" />
+<P2  x="722" y="689" id="469" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1162" >
+<CONNECTOR type="115" id="1123" >
 <cdparam x="504" y="597" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="504" y="597" id="588" />
-<P2  x="572" y="702" id="502" />
+<P1  x="504" y="597" id="549" />
+<P2  x="572" y="702" id="463" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1163" >
+<CONNECTOR type="115" id="1124" >
 <cdparam x="464" y="637" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="464" y="637" id="589" />
-<P2  x="439" y="778" id="556" />
+<P1  x="464" y="637" id="550" />
+<P2  x="439" y="778" id="517" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1164" >
+<CONNECTOR type="115" id="1125" >
 <cdparam x="424" y="597" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="424" y="597" id="587" />
-<P2  x="346" y="759" id="536" />
+<P1  x="424" y="597" id="548" />
+<P2  x="346" y="759" id="497" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1165" >
+<CONNECTOR type="115" id="1126" >
 <cdparam x="289" y="619" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to read channel" value="null" />
-<P1  x="289" y="619" id="597" />
-<P2  x="230" y="803" id="693" />
+<P1  x="289" y="619" id="558" />
+<P2  x="230" y="803" id="654" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1166" >
+<CONNECTOR type="115" id="1127" >
 <cdparam x="249" y="579" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="249" y="579" id="595" />
-<P2  x="132" y="789" id="540" />
+<P1  x="249" y="579" id="556" />
+<P2  x="132" y="789" id="501" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1167" >
+<CONNECTOR type="115" id="1128" >
 <cdparam x="371" y="93" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to notified event" value="null" />
-<P1  x="324" y="93" id="627" />
-<P2  x="374" y="128" id="635" />
+<P1  x="325" y="99" id="588" />
+<P2  x="374" y="128" id="596" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1168" >
+<CONNECTOR type="115" id="1129" >
 <cdparam x="234" y="169" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="234" y="169" id="633" />
-<P2  x="234" y="202" id="630" />
+<P1  x="234" y="169" id="594" />
+<P2  x="234" y="202" id="591" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1169" >
+<CONNECTOR type="115" id="1130" >
 <cdparam x="234" y="104" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to action state" value="null" />
-<P1  x="234" y="104" id="628" />
-<P2  x="234" y="139" id="632" />
+<P1  x="235" y="110" id="589" />
+<P2  x="234" y="139" id="593" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1170" >
+<CONNECTOR type="115" id="1131" >
 <cdparam x="234" y="47" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for loop" value="null" />
-<P1  x="234" y="47" id="599" />
-<P2  x="234" y="74" id="626" />
+<P1  x="234" y="47" id="560" />
+<P2  x="235" y="80" id="587" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1171" >
+<CONNECTOR type="115" id="1132" >
 <cdparam x="425" y="162" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from notified event to choice" value="null" />
-<P1  x="374" y="158" id="636" />
-<P2  x="374" y="182" id="578" />
+<P1  x="374" y="158" id="597" />
+<P2  x="374" y="182" id="539" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1172" >
+<CONNECTOR type="115" id="1133" >
 <cdparam x="564" y="482" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="464" y="322" id="662" />
-<P2  x="722" y="529" id="641" />
+<P1  x="464" y="322" id="623" />
+<P2  x="722" y="529" id="602" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1173" >
+<CONNECTOR type="115" id="1134" >
 <cdparam x="722" y="559" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="722" y="559" id="642" />
-<P2  x="722" y="584" id="638" />
+<P1  x="722" y="559" id="603" />
+<P2  x="722" y="584" id="599" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1174" >
+<CONNECTOR type="115" id="1135" >
 <cdparam x="604" y="442" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="504" y="282" id="658" />
-<P2  x="1008" y="523" id="644" />
+<P1  x="504" y="282" id="619" />
+<P2  x="1008" y="523" id="605" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1175" >
+<CONNECTOR type="115" id="1136" >
 <cdparam x="1007" y="553" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="1008" y="553" id="645" />
-<P2  x="1008" y="580" id="623" />
+<P1  x="1008" y="553" id="606" />
+<P2  x="1008" y="580" id="584" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1176" >
+<CONNECTOR type="115" id="1137" >
 <cdparam x="524" y="442" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="464" y="322" id="659" />
-<P2  x="464" y="487" id="647" />
+<P1  x="464" y="322" id="620" />
+<P2  x="464" y="487" id="608" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1177" >
+<CONNECTOR type="115" id="1138" >
 <cdparam x="330" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="424" y="282" id="660" />
-<P2  x="289" y="463" id="650" />
+<P1  x="424" y="282" id="621" />
+<P2  x="289" y="463" id="611" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1178" >
+<CONNECTOR type="115" id="1139" >
 <cdparam x="318" y="520" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="289" y="493" id="651" />
-<P2  x="289" y="554" id="594" />
+<P1  x="289" y="493" id="612" />
+<P2  x="289" y="554" id="555" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1179" >
+<CONNECTOR type="115" id="1140" >
 <cdparam x="160" y="481" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="148" y="501" id="571" />
-<P2  x="126" y="544" id="618" />
+<P1  x="148" y="501" id="532" />
+<P2  x="126" y="544" id="579" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1180" >
+<CONNECTOR type="115" id="1141" >
 <cdparam x="290" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="424" y="282" id="657" />
-<P2  x="188" y="414" id="653" />
+<P1  x="424" y="282" id="618" />
+<P2  x="188" y="414" id="614" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1181" >
+<CONNECTOR type="115" id="1142" >
 <cdparam x="229" y="467" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="188" y="444" id="654" />
-<P2  x="188" y="476" id="570" />
+<P1  x="188" y="444" id="615" />
+<P2  x="188" y="476" id="531" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1182" >
+<CONNECTOR type="115" id="1143" >
 <cdparam x="228" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="228" y="501" id="572" />
-<P2  x="236" y="524" id="667" />
+<P1  x="228" y="501" id="533" />
+<P2  x="236" y="524" id="628" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1183" >
+<CONNECTOR type="115" id="1144" >
 <cdparam x="334" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to wait event" value="null" />
-<P1  x="334" y="207" id="579" />
-<P2  x="301" y="223" id="671" />
+<P1  x="334" y="207" id="540" />
+<P2  x="301" y="223" id="632" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1184" >
+<CONNECTOR type="115" id="1145" >
 <cdparam x="301" y="253" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="301" y="253" id="672" />
-<P2  x="301" y="285" id="674" />
+<P1  x="301" y="253" id="633" />
+<P2  x="301" y="285" id="635" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1185" >
+<CONNECTOR type="115" id="1146" >
 <cdparam x="464" y="517" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to choice" value="null" />
-<P1  x="464" y="517" id="648" />
-<P2  x="464" y="572" id="586" />
+<P1  x="464" y="517" id="609" />
+<P2  x="464" y="572" id="547" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1186" >
+<CONNECTOR type="115" id="1147" >
 <cdparam x="329" y="579" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="329" y="579" id="596" />
-<P2  x="353" y="609" id="669" />
+<P1  x="329" y="579" id="557" />
+<P2  x="353" y="609" id="630" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1187" >
+<CONNECTOR type="115" id="1148" >
 <cdparam x="126" y="574" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="126" y="574" id="619" />
-<P2  x="126" y="610" id="621" />
+<P1  x="126" y="574" id="580" />
+<P2  x="126" y="610" id="582" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1188" >
+<CONNECTOR type="115" id="1149" >
 <cdparam x="414" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to select" value="null" />
-<P1  x="414" y="207" id="580" />
-<P2  x="464" y="257" id="656" />
+<P1  x="414" y="207" id="541" />
+<P2  x="464" y="257" id="617" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1189" >
+<CONNECTOR type="115" id="1150" >
 <cdparam x="230" y="833" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to execI" value="null" />
-<P1  x="230" y="833" id="694" />
-<P2  x="230" y="858" id="560" />
+<P1  x="230" y="833" id="655" />
+<P2  x="230" y="858" id="521" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1190" >
+<CONNECTOR type="115" id="1151" >
 <cdparam x="716" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="968" y="795" id="547" />
-<P2  x="843" y="859" id="530" />
+<P1  x="968" y="795" id="508" />
+<P2  x="843" y="859" id="491" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1191" >
+<CONNECTOR type="115" id="1152" >
 <cdparam x="720" y="1074" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="728" y="990" id="743" />
-<P2  x="728" y="1027" id="745" />
+<P1  x="728" y="990" id="704" />
+<P2  x="728" y="1027" id="706" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1192" >
+<CONNECTOR type="115" id="1153" >
 <cdparam x="733" y="899" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="803" y="884" id="531" />
-<P2  x="728" y="960" id="742" />
+<P1  x="803" y="884" id="492" />
+<P2  x="728" y="960" id="703" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1193" >
+<CONNECTOR type="115" id="1154" >
 <cdparam x="800" y="938" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="843" y="924" id="533" />
-<P2  x="800" y="1004" id="524" />
+<P1  x="843" y="924" id="494" />
+<P2  x="800" y="1004" id="485" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1194" >
+<CONNECTOR type="115" id="1155" >
 <cdparam x="800" y="1057" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="800" y="1044" id="525" />
-<P2  x="800" y="1081" id="747" />
+<P1  x="800" y="1044" id="486" />
+<P2  x="800" y="1081" id="708" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1195" >
+<CONNECTOR type="115" id="1156" >
 <cdparam x="132" y="886" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="132" y="886" id="874" />
-<P2  x="132" y="933" id="709" />
+<P1  x="132" y="886" id="835" />
+<P2  x="132" y="933" id="670" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1196" >
+<CONNECTOR type="115" id="1157" >
 <cdparam x="943" y="1061" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="943" y="1060" id="513" />
-<P2  x="943" y="1118" id="792" />
+<P1  x="943" y="1060" id="474" />
+<P2  x="943" y="1118" id="753" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1197" >
+<CONNECTOR type="115" id="1158" >
 <cdparam x="1049" y="1093" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1049" y="1092" id="565" />
-<P2  x="1049" y="1150" id="817" />
+<P1  x="1049" y="1092" id="526" />
+<P2  x="1049" y="1150" id="778" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1198" >
+<CONNECTOR type="115" id="1159" >
 <cdparam x="1049" y="994" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1049" y="994" id="521" />
-<P2  x="1049" y="1052" id="564" />
+<P1  x="1049" y="994" id="482" />
+<P2  x="1049" y="1052" id="525" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1199" >
+<CONNECTOR type="115" id="1160" >
 <cdparam x="696" y="742" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="722" y="729" id="509" />
-<P2  x="722" y="753" id="842" />
+<P1  x="722" y="729" id="470" />
+<P2  x="722" y="753" id="803" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1200" >
+<CONNECTOR type="115" id="1161" >
 <cdparam x="132" y="1125" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="132" y="1125" id="848" />
-<P2  x="132" y="1162" id="850" />
+<P1  x="132" y="1125" id="809" />
+<P2  x="132" y="1162" id="811" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1201" >
+<CONNECTOR type="115" id="1162" >
 <cdparam x="132" y="1192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="132" y="1192" id="851" />
-<P2  x="132" y="1231" id="853" />
+<P1  x="132" y="1192" id="812" />
+<P2  x="132" y="1231" id="814" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1202" >
+<CONNECTOR type="115" id="1163" >
 <cdparam x="132" y="1066" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="132" y="1066" id="707" />
-<P2  x="132" y="1095" id="847" />
+<P1  x="132" y="1066" id="668" />
+<P2  x="132" y="1095" id="808" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1203" >
+<CONNECTOR type="115" id="1164" >
 <cdparam x="229" y="1127" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="229" y="1127" id="856" />
-<P2  x="229" y="1164" id="858" />
+<P1  x="229" y="1127" id="817" />
+<P2  x="229" y="1164" id="819" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1204" >
+<CONNECTOR type="115" id="1165" >
 <cdparam x="346" y="1131" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="346" y="1131" id="862" />
-<P2  x="346" y="1168" id="864" />
+<P1  x="346" y="1131" id="823" />
+<P2  x="346" y="1168" id="825" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1205" >
+<CONNECTOR type="115" id="1166" >
 <cdparam x="346" y="1051" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="346" y="1051" id="713" />
-<P2  x="346" y="1101" id="861" />
+<P1  x="346" y="1051" id="674" />
+<P2  x="346" y="1101" id="822" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1206" >
+<CONNECTOR type="115" id="1167" >
 <cdparam x="437" y="1118" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="438" y="1115" id="868" />
-<P2  x="438" y="1154" id="870" />
+<P1  x="438" y="1115" id="829" />
+<P2  x="438" y="1154" id="831" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1207" >
+<CONNECTOR type="115" id="1168" >
 <cdparam x="438" y="1057" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send request" value="null" />
-<P1  x="438" y="1057" id="702" />
-<P2  x="438" y="1085" id="867" />
+<P1  x="438" y="1057" id="663" />
+<P2  x="438" y="1085" id="828" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1208" >
+<CONNECTOR type="115" id="1169" >
 <cdparam x="132" y="808" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="132" y="829" id="541" />
-<P2  x="132" y="856" id="873" />
+<P1  x="132" y="829" id="502" />
+<P2  x="132" y="856" id="834" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1209" >
+<CONNECTOR type="115" id="1170" >
 <cdparam x="230" y="898" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="230" y="898" id="561" />
-<P2  x="230" y="935" id="876" />
+<P1  x="230" y="898" id="522" />
+<P2  x="230" y="935" id="837" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1210" >
+<CONNECTOR type="115" id="1171" >
 <cdparam x="230" y="965" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="230" y="965" id="877" />
-<P2  x="230" y="997" id="696" />
+<P1  x="230" y="965" id="838" />
+<P2  x="230" y="997" id="657" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1211" >
+<CONNECTOR type="115" id="1172" >
 <cdparam x="346" y="799" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="346" y="799" id="537" />
-<P2  x="346" y="826" id="882" />
+<P1  x="346" y="799" id="498" />
+<P2  x="346" y="826" id="843" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1212" >
+<CONNECTOR type="115" id="1173" >
 <cdparam x="346" y="856" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="346" y="856" id="883" />
-<P2  x="346" y="895" id="720" />
+<P1  x="346" y="856" id="844" />
+<P2  x="346" y="895" id="681" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1213" >
+<CONNECTOR type="115" id="1174" >
 <cdparam x="439" y="818" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="439" y="818" id="557" />
-<P2  x="439" y="860" id="879" />
+<P1  x="439" y="818" id="518" />
+<P2  x="439" y="860" id="840" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1214" >
+<CONNECTOR type="115" id="1175" >
 <cdparam x="439" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="439" y="890" id="880" />
-<P2  x="439" y="936" id="717" />
+<P1  x="439" y="890" id="841" />
+<P2  x="439" y="936" id="678" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1215" >
+<CONNECTOR type="115" id="1176" >
 <cdparam x="132" y="963" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="132" y="963" id="710" />
-<P2  x="132" y="981" id="894" />
+<P1  x="132" y="963" id="671" />
+<P2  x="132" y="981" id="855" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1216" >
+<CONNECTOR type="115" id="1177" >
 <cdparam x="132" y="1011" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="132" y="1011" id="895" />
-<P2  x="132" y="1036" id="706" />
+<P1  x="132" y="1011" id="856" />
+<P2  x="132" y="1036" id="667" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1217" >
+<CONNECTOR type="115" id="1178" >
 <cdparam x="230" y="1027" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="230" y="1027" id="697" />
-<P2  x="229" y="1047" id="885" />
+<P1  x="230" y="1027" id="658" />
+<P2  x="229" y="1047" id="846" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1218" >
+<CONNECTOR type="115" id="1179" >
 <cdparam x="228" y="1088" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send request" value="null" />
-<P1  x="229" y="1077" id="886" />
-<P2  x="229" y="1097" id="855" />
+<P1  x="229" y="1077" id="847" />
+<P2  x="229" y="1097" id="816" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1219" >
+<CONNECTOR type="115" id="1180" >
 <cdparam x="346" y="925" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="346" y="925" id="721" />
-<P2  x="346" y="957" id="888" />
+<P1  x="346" y="925" id="682" />
+<P2  x="346" y="957" id="849" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1220" >
+<CONNECTOR type="115" id="1181" >
 <cdparam x="348" y="987" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="346" y="987" id="889" />
-<P2  x="346" y="1021" id="712" />
+<P1  x="346" y="987" id="850" />
+<P2  x="346" y="1021" id="673" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1221" >
+<CONNECTOR type="115" id="1182" >
 <cdparam x="439" y="966" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="439" y="966" id="718" />
-<P2  x="438" y="978" id="891" />
+<P1  x="439" y="966" id="679" />
+<P2  x="438" y="978" id="852" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1222" >
+<CONNECTOR type="115" id="1183" >
 <cdparam x="438" y="1008" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="438" y="1008" id="892" />
-<P2  x="438" y="1027" id="701" />
+<P1  x="438" y="1008" id="853" />
+<P2  x="438" y="1027" id="662" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1223" >
+<CONNECTOR type="115" id="1184" >
 <cdparam x="722" y="783" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="722" y="783" id="843" />
-<P2  x="722" y="808" id="897" />
+<P1  x="722" y="783" id="804" />
+<P2  x="722" y="808" id="858" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1224" >
+<CONNECTOR type="115" id="1185" >
 <cdparam x="722" y="838" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="722" y="838" id="898" />
-<P2  x="722" y="860" id="845" />
+<P1  x="722" y="838" id="859" />
+<P2  x="722" y="860" id="806" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1225" >
+<CONNECTOR type="115" id="1186" >
 <cdparam x="800" y="1111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="800" y="1111" id="748" />
-<P2  x="798" y="1136" id="900" />
+<P1  x="800" y="1111" id="709" />
+<P2  x="798" y="1136" id="861" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1226" >
+<CONNECTOR type="115" id="1187" >
 <cdparam x="798" y="1166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="798" y="1166" id="901" />
-<P2  x="799" y="1188" id="784" />
+<P1  x="798" y="1166" id="862" />
+<P2  x="799" y="1188" id="745" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1227" >
+<CONNECTOR type="115" id="1188" >
 <cdparam x="943" y="1148" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="943" y="1148" id="793" />
-<P2  x="943" y="1173" id="903" />
+<P1  x="943" y="1148" id="754" />
+<P2  x="943" y="1173" id="864" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1228" >
+<CONNECTOR type="115" id="1189" >
 <cdparam x="950" y="1201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="943" y="1203" id="904" />
-<P2  x="943" y="1229" id="812" />
+<P1  x="943" y="1203" id="865" />
+<P2  x="943" y="1229" id="773" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1229" >
+<CONNECTOR type="115" id="1190" >
 <cdparam x="1049" y="1180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1049" y="1180" id="818" />
-<P2  x="1049" y="1206" id="906" />
+<P1  x="1049" y="1180" id="779" />
+<P2  x="1049" y="1206" id="867" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1230" >
+<CONNECTOR type="115" id="1191" >
 <cdparam x="1049" y="1223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="1049" y="1236" id="907" />
-<P2  x="1049" y="1261" id="837" />
+<P1  x="1049" y="1236" id="868" />
+<P2  x="1049" y="1261" id="798" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1231" >
+<CONNECTOR type="115" id="1192" >
 <cdparam x="883" y="884" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="883" y="884" id="532" />
-<P2  x="909" y="917" id="911" />
+<P1  x="883" y="884" id="493" />
+<P2  x="909" y="917" id="872" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1232" >
+<CONNECTOR type="115" id="1193" >
 <cdparam x="612" y="727" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="612" y="727" id="504" />
-<P2  x="622" y="757" id="909" />
+<P1  x="612" y="727" id="465" />
+<P2  x="622" y="757" id="870" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1233" >
+<CONNECTOR type="115" id="1194" >
 <cdparam x="532" y="727" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="532" y="727" id="503" />
-<P2  x="496" y="763" id="787" />
+<P1  x="532" y="727" id="464" />
+<P2  x="496" y="763" id="748" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1234" >
+<CONNECTOR type="115" id="1195" >
 <cdparam x="799" y="1218" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="799" y="1218" id="785" />
-<P2  x="799" y="1265" id="723" />
+<P1  x="799" y="1218" id="746" />
+<P2  x="799" y="1265" id="684" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1235" >
+<CONNECTOR type="115" id="1196" >
 <cdparam x="1009" y="954" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1009" y="954" id="519" />
-<P2  x="943" y="1020" id="512" />
+<P1  x="1009" y="954" id="480" />
+<P2  x="943" y="1020" id="473" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1236" >
+<CONNECTOR type="115" id="1197" >
 <cdparam x="229" y="1194" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="229" y="1194" id="859" />
-<P2  x="229" y="1232" id="699" />
+<P1  x="229" y="1194" id="820" />
+<P2  x="229" y="1232" id="660" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1237" >
+<CONNECTOR type="115" id="1198" >
 <cdparam x="346" y="1198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="346" y="1198" id="865" />
-<P2  x="344" y="1224" id="715" />
+<P1  x="346" y="1198" id="826" />
+<P2  x="344" y="1224" id="676" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1238" >
+<CONNECTOR type="115" id="1199" >
 <cdparam x="438" y="1184" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="438" y="1184" id="871" />
-<P2  x="438" y="1208" id="704" />
+<P1  x="438" y="1184" id="832" />
+<P2  x="438" y="1208" id="665" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1239" >
+<CONNECTOR type="115" id="1200" >
 <cdparam x="496" y="793" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="496" y="793" id="788" />
-<P2  x="496" y="825" id="790" />
+<P1  x="496" y="793" id="749" />
+<P2  x="496" y="825" id="751" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1240" >
+<CONNECTOR type="115" id="1201" >
 <cdparam x="943" y="1259" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="943" y="1259" id="813" />
-<P2  x="943" y="1306" id="815" />
+<P1  x="943" y="1259" id="774" />
+<P2  x="943" y="1306" id="776" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1241" >
+<CONNECTOR type="115" id="1202" >
 <cdparam x="1008" y="736" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to choice" value="null" />
-<P1  x="1008" y="736" id="553" />
-<P2  x="1008" y="770" id="546" />
+<P1  x="1008" y="736" id="514" />
+<P2  x="1008" y="770" id="507" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1242" >
+<CONNECTOR type="115" id="1203" >
 <cdparam x="1008" y="835" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1008" y="835" id="549" />
-<P2  x="1049" y="929" id="518" />
+<P1  x="1008" y="835" id="510" />
+<P2  x="1049" y="929" id="479" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1243" >
+<CONNECTOR type="115" id="1204" >
 <cdparam x="1049" y="1291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1049" y="1291" id="838" />
-<P2  x="1049" y="1336" id="840" />
+<P1  x="1049" y="1291" id="799" />
+<P2  x="1049" y="1336" id="801" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1244" >
+<CONNECTOR type="115" id="1205" >
 <cdparam x="1208" y="1152" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1208" y="1142" id="497" />
-<P2  x="1208" y="1209" id="913" />
+<P1  x="1208" y="1142" id="458" />
+<P2  x="1208" y="1209" id="874" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1245" >
+<CONNECTOR type="115" id="1206" >
 <cdparam x="1208" y="1239" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to action state" value="null" />
-<P1  x="1208" y="1239" id="914" />
-<P2  x="1208" y="1290" id="933" />
+<P1  x="1208" y="1239" id="875" />
+<P2  x="1208" y="1290" id="894" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1246" >
+<CONNECTOR type="115" id="1207" >
 <cdparam x="1208" y="1320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to send event" value="null" />
-<P1  x="1208" y="1320" id="934" />
-<P2  x="1208" y="1346" id="941" />
+<P1  x="1208" y="1320" id="895" />
+<P2  x="1208" y="1346" id="902" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1247" >
+<CONNECTOR type="115" id="1208" >
 <cdparam x="1206" y="1385" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to action state" value="null" />
-<P1  x="1208" y="1376" id="942" />
-<P2  x="1207" y="1397" id="938" />
+<P1  x="1208" y="1376" id="903" />
+<P2  x="1207" y="1397" id="899" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1248" >
+<CONNECTOR type="115" id="1209" >
 <cdparam x="1206" y="1088" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1208" y="1075" id="493" />
-<P2  x="1208" y="1102" id="496" />
+<P1  x="1208" y="1075" id="454" />
+<P2  x="1208" y="1102" id="457" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1249" >
+<CONNECTOR type="115" id="1210" >
 <cdparam x="1248" y="1035" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1248" y="1035" id="492" />
-<P2  x="1287" y="1065" id="944" />
+<P1  x="1248" y="1035" id="453" />
+<P2  x="1287" y="1065" id="905" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1250" >
+<CONNECTOR type="115" id="1211" >
 <cdparam x="1207" y="1427" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1207" y="1427" id="939" />
-<P2  x="1207" y="1466" id="936" />
+<P1  x="1207" y="1427" id="900" />
+<P2  x="1207" y="1466" id="897" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1251" >
+<CONNECTOR type="115" id="1212" >
 <cdparam x="1553" y="1019" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1567" y="1021" id="463" />
-<P2  x="1529" y="1059" id="456" />
+<P1  x="1567" y="1021" id="424" />
+<P2  x="1529" y="1059" id="417" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1252" >
+<CONNECTOR type="115" id="1213" >
 <cdparam x="1529" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1529" y="1289" id="453" />
-<P2  x="1529" y="1343" id="951" />
+<P1  x="1529" y="1289" id="414" />
+<P2  x="1529" y="1343" id="912" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1253" >
+<CONNECTOR type="115" id="1214" >
 <cdparam x="1684" y="929" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to send event" value="null" />
-<P1  x="1728" y="930" id="473" />
-<P2  x="1731" y="1021" id="954" />
+<P1  x="1728" y="930" id="434" />
+<P2  x="1731" y="1021" id="915" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1254" >
+<CONNECTOR type="115" id="1215" >
 <cdparam x="1615" y="1283" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1641" y="1270" id="477" />
-<P2  x="1641" y="1294" id="991" />
+<P1  x="1641" y="1270" id="438" />
+<P2  x="1641" y="1294" id="952" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1255" >
+<CONNECTOR type="115" id="1216" >
 <cdparam x="1641" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1641" y="1324" id="992" />
-<P2  x="1642" y="1343" id="1033" />
+<P1  x="1641" y="1324" id="953" />
+<P2  x="1642" y="1343" id="994" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1256" >
+<CONNECTOR type="115" id="1217" >
 <cdparam x="1529" y="1373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1529" y="1373" id="952" />
-<P2  x="1529" y="1400" id="1030" />
+<P1  x="1529" y="1373" id="913" />
+<P2  x="1529" y="1400" id="991" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1257" >
+<CONNECTOR type="115" id="1218" >
 <cdparam x="1529" y="1422" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="1529" y="1430" id="1031" />
-<P2  x="1529" y="1452" id="946" />
+<P1  x="1529" y="1430" id="992" />
+<P2  x="1529" y="1452" id="907" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1258" >
+<CONNECTOR type="115" id="1219" >
 <cdparam x="1642" y="1373" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to write channel" value="null" />
-<P1  x="1642" y="1373" id="1034" />
-<P2  x="1642" y="1399" id="1036" />
+<P1  x="1642" y="1373" id="995" />
+<P2  x="1642" y="1399" id="997" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1259" >
+<CONNECTOR type="115" id="1220" >
 <cdparam x="1956" y="1361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1956" y="1361" id="431" />
-<P2  x="1920" y="1406" id="1046" />
+<P1  x="1956" y="1361" id="392" />
+<P2  x="1920" y="1406" id="1007" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1260" >
+<CONNECTOR type="115" id="1221" >
 <cdparam x="2100" y="1490" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2101" y="1491" id="1054" />
-<P2  x="2101" y="1532" id="1056" />
+<P1  x="2101" y="1491" id="1015" />
+<P2  x="2101" y="1532" id="1017" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1261" >
+<CONNECTOR type="115" id="1222" >
 <cdparam x="1996" y="1401" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1996" y="1401" id="433" />
-<P2  x="1996" y="1429" id="1061" />
+<P1  x="1996" y="1401" id="394" />
+<P2  x="1996" y="1429" id="1022" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1262" >
+<CONNECTOR type="115" id="1223" >
 <cdparam x="1996" y="1459" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to action state" value="null" />
-<P1  x="1996" y="1459" id="1062" />
-<P2  x="1996" y="1488" id="1058" />
+<P1  x="1996" y="1459" id="1023" />
+<P2  x="1996" y="1488" id="1019" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1263" >
+<CONNECTOR type="115" id="1224" >
 <cdparam x="2021" y="1038" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="2237" y="966" id="423" />
-<P2  x="2218" y="1054" id="480" />
+<P1  x="2237" y="966" id="384" />
+<P2  x="2218" y="1054" id="441" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1264" >
+<CONNECTOR type="115" id="1225" >
 <cdparam x="2217" y="1323" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send request to write channel" value="null" />
-<P1  x="2217" y="1323" id="1104" />
-<P2  x="2217" y="1360" id="1106" />
+<P1  x="2217" y="1323" id="1065" />
+<P2  x="2217" y="1360" id="1067" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1265" >
+<CONNECTOR type="115" id="1226" >
 <cdparam x="2218" y="1094" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to action state" value="null" />
-<P1  x="2218" y="1094" id="481" />
-<P2  x="2218" y="1131" id="1109" />
+<P1  x="2218" y="1094" id="442" />
+<P2  x="2218" y="1131" id="1070" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1266" >
+<CONNECTOR type="115" id="1227" >
 <cdparam x="2218" y="1161" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to write channel" value="null" />
-<P1  x="2218" y="1161" id="1110" />
-<P2  x="2218" y="1193" id="1098" />
+<P1  x="2218" y="1161" id="1071" />
+<P2  x="2218" y="1193" id="1059" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1267" >
+<CONNECTOR type="115" id="1228" >
 <cdparam x="2218" y="1223" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="2218" y="1223" id="1099" />
-<P2  x="2217" y="1243" id="1112" />
+<P1  x="2218" y="1223" id="1060" />
+<P2  x="2217" y="1243" id="1073" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1268" >
+<CONNECTOR type="115" id="1229" >
 <cdparam x="2216" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send request" value="null" />
-<P1  x="2217" y="1273" id="1113" />
-<P2  x="2217" y="1293" id="1103" />
+<P1  x="2217" y="1273" id="1074" />
+<P2  x="2217" y="1293" id="1064" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1269" >
+<CONNECTOR type="115" id="1230" >
 <cdparam x="2217" y="1390" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to action state" value="null" />
-<P1  x="2217" y="1390" id="1107" />
-<P2  x="2217" y="1419" id="1115" />
+<P1  x="2217" y="1390" id="1068" />
+<P2  x="2217" y="1419" id="1076" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1270" >
+<CONNECTOR type="115" id="1231" >
 <cdparam x="2341" y="1060" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="2341" y="1059" id="485" />
-<P2  x="2341" y="1117" id="1118" />
+<P1  x="2341" y="1059" id="446" />
+<P2  x="2341" y="1117" id="1079" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1271" >
+<CONNECTOR type="115" id="1232" >
 <cdparam x="1529" y="1099" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to write channel" value="null" />
-<P1  x="1529" y="1099" id="457" />
-<P2  x="1529" y="1127" id="948" />
+<P1  x="1529" y="1099" id="418" />
+<P2  x="1529" y="1127" id="909" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1272" >
+<CONNECTOR type="115" id="1233" >
 <cdparam x="2101" y="1433" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="2101" y="1433" id="417" />
-<P2  x="2101" y="1461" id="1053" />
+<P1  x="2101" y="1433" id="378" />
+<P2  x="2101" y="1461" id="1014" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1273" >
+<CONNECTOR type="115" id="1234" >
 <cdparam x="2158" y="1460" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="2141" y="1393" id="416" />
-<P2  x="2178" y="1416" id="1148" />
+<P1  x="2141" y="1393" id="377" />
+<P2  x="2178" y="1416" id="1109" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1274" >
+<CONNECTOR type="115" id="1235" >
 <cdparam x="1688" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1688" y="890" id="471" />
-<P2  x="1607" y="996" id="462" />
+<P1  x="1688" y="890" id="432" />
+<P2  x="1607" y="996" id="423" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1275" >
+<CONNECTOR type="115" id="1236" >
 <cdparam x="1768" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1768" y="890" id="472" />
-<P2  x="2277" y="941" id="422" />
+<P1  x="1768" y="890" id="433" />
+<P2  x="2277" y="941" id="383" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1276" >
+<CONNECTOR type="115" id="1237" >
 <cdparam x="2317" y="966" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="2317" y="966" id="424" />
-<P2  x="2341" y="1019" id="484" />
+<P1  x="2317" y="966" id="385" />
+<P2  x="2341" y="1019" id="445" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1277" >
+<CONNECTOR type="115" id="1238" >
 <cdparam x="2341" y="1147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="2341" y="1147" id="1119" />
-<P2  x="2341" y="1194" id="1143" />
+<P1  x="2341" y="1147" id="1080" />
+<P2  x="2341" y="1194" id="1104" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1278" >
+<CONNECTOR type="115" id="1239" >
 <cdparam x="2341" y="1224" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to send event" value="null" />
-<P1  x="2341" y="1224" id="1144" />
-<P2  x="2341" y="1262" id="1138" />
+<P1  x="2341" y="1224" id="1105" />
+<P2  x="2341" y="1262" id="1099" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1279" >
+<CONNECTOR type="115" id="1240" >
 <cdparam x="1731" y="1051" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to choice" value="null" />
-<P1  x="1731" y="1051" id="955" />
-<P2  x="1731" y="1081" id="1155" />
+<P1  x="1731" y="1051" id="916" />
+<P2  x="1731" y="1081" id="1116" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1280" >
+<CONNECTOR type="115" id="1241" >
 <cdparam x="1647" y="1021" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1647" y="1021" id="464" />
-<P2  x="1659" y="1052" id="1146" />
+<P1  x="1647" y="1021" id="425" />
+<P2  x="1659" y="1052" id="1107" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1281" >
+<CONNECTOR type="115" id="1242" >
 <cdparam x="1826" y="1324" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to action state" value="null" />
-<P1  x="1826" y="1324" id="441" />
-<P2  x="1826" y="1344" id="1041" />
+<P1  x="1826" y="1324" id="402" />
+<P2  x="1826" y="1344" id="1002" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1282" >
+<CONNECTOR type="115" id="1243" >
 <cdparam x="1826" y="1374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1826" y="1374" id="1042" />
-<P2  x="1828" y="1452" id="1044" />
+<P1  x="1826" y="1374" id="1003" />
+<P2  x="1828" y="1452" id="1005" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1283" >
+<CONNECTOR type="115" id="1244" >
 <cdparam x="1786" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="1786" y="1284" id="439" />
-<P2  x="1740" y="1330" id="1039" />
+<P1  x="1786" y="1284" id="400" />
+<P2  x="1740" y="1330" id="1000" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1284" >
+<CONNECTOR type="115" id="1245" >
 <cdparam x="1920" y="1436" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1920" y="1436" id="1047" />
-<P2  x="1920" y="1476" id="1049" />
+<P1  x="1920" y="1436" id="1008" />
+<P2  x="1920" y="1476" id="1010" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1285" >
+<CONNECTOR type="115" id="1246" >
 <cdparam x="1996" y="1518" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="1996" y="1518" id="1059" />
-<P2  x="1996" y="1538" id="1051" />
+<P1  x="1996" y="1518" id="1020" />
+<P2  x="1996" y="1538" id="1012" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1286" >
+<CONNECTOR type="115" id="1247" >
 <cdparam x="2036" y="1361" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="2036" y="1361" id="432" />
-<P2  x="2101" y="1368" id="414" />
+<P1  x="2036" y="1361" id="393" />
+<P2  x="2101" y="1368" id="375" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1287" >
+<CONNECTOR type="115" id="1248" >
 <cdparam x="1866" y="1284" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1866" y="1284" id="440" />
-<P2  x="1996" y="1336" id="430" />
+<P1  x="1866" y="1284" id="401" />
+<P2  x="1996" y="1336" id="391" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1288" >
+<CONNECTOR type="115" id="1249" >
 <cdparam x="2341" y="1292" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2341" y="1292" id="1139" />
-<P2  x="2340" y="1319" id="1141" />
+<P1  x="2341" y="1292" id="1100" />
+<P2  x="2340" y="1319" id="1102" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1289" >
+<CONNECTOR type="115" id="1250" >
 <cdparam x="2217" y="1449" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from action state to stop state" value="null" />
-<P1  x="2217" y="1449" id="1116" />
-<P2  x="2217" y="1478" id="1101" />
+<P1  x="2217" y="1449" id="1077" />
+<P2  x="2217" y="1478" id="1062" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1290" >
+<CONNECTOR type="115" id="1251" >
 <cdparam x="2277" y="1006" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to stop state" value="null" />
-<P1  x="2277" y="1006" id="425" />
-<P2  x="2278" y="1034" id="1150" />
+<P1  x="2277" y="1006" id="386" />
+<P2  x="2278" y="1034" id="1111" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1291" >
+<CONNECTOR type="115" id="1252" >
 <cdparam x="1642" y="1429" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="1642" y="1429" id="1037" />
-<P2  x="1642" y="1463" id="994" />
+<P1  x="1642" y="1429" id="998" />
+<P2  x="1642" y="1463" id="955" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1292" >
+<CONNECTOR type="115" id="1253" >
 <cdparam x="1529" y="1157" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to send event" value="null" />
-<P1  x="1529" y="1157" id="949" />
-<P2  x="1529" y="1187" id="1152" />
+<P1  x="1529" y="1157" id="910" />
+<P2  x="1529" y="1187" id="1113" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1293" >
+<CONNECTOR type="115" id="1254" >
 <cdparam x="1529" y="1217" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to execI" value="null" />
-<P1  x="1529" y="1217" id="1153" />
-<P2  x="1529" y="1249" id="452" />
+<P1  x="1529" y="1217" id="1114" />
+<P2  x="1529" y="1249" id="413" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1294" >
+<CONNECTOR type="115" id="1255" >
 <cdparam x="1691" y="1156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to execI" value="null" />
-<P1  x="1691" y="1156" id="447" />
-<P2  x="1641" y="1230" id="476" />
+<P1  x="1691" y="1156" id="408" />
+<P2  x="1641" y="1230" id="437" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1295" >
+<CONNECTOR type="115" id="1256" >
 <cdparam x="1771" y="1156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from choice to choice" value="null" />
-<P1  x="1771" y="1156" id="448" />
-<P2  x="1826" y="1259" id="438" />
+<P1  x="1771" y="1156" id="409" />
+<P2  x="1826" y="1259" id="399" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="1296" >
+<CONNECTOR type="115" id="1257" >
 <cdparam x="1731" y="1111" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to choice" value="null" />
-<P1  x="1731" y="1111" id="1156" />
-<P2  x="1731" y="1131" id="446" />
+<P1  x="1731" y="1111" id="1117" />
+<P2  x="1731" y="1131" id="407" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
-<TMLActivityDiagramPanel name="Timer" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="1304" >
-<cdparam x="509" y="222" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TMLActivityDiagramPanel name="SmartCard" minX="10" maxX="1400" minY="10" maxY="900" >
+<COMPONENT type="1000" id="1259" >
+<cdparam x="159" y="66" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1300" />
-<TGConnectingPoint num="1" id="1301" />
-<TGConnectingPoint num="2" id="1302" />
-<TGConnectingPoint num="3" id="1303" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1258" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1297" >
-<father id="1304" num="0" />
-<cdparam x="464" y="232" />
-<sizeparam width="52" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1010" id="1262" >
+<cdparam x="138" y="129" />
+<sizeparam width="57" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ x==0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1298" >
-<father id="1304" num="1" />
-<cdparam x="544" y="234" />
-<sizeparam width="42" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="reset() " />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<extraparam>
+<Data eventName="reset" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1008" id="1265" >
+<cdparam x="108" y="182" />
+<sizeparam width="116" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ x&gt;0 ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1299" >
-<father id="1304" num="2" />
-<cdparam x="529" y="267" />
-<sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="send event" value="answerToReset()" />
+<TGConnectingPoint num="0" id="1263" />
+<TGConnectingPoint num="1" id="1264" />
+<extraparam>
+<Data eventName="answerToReset" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="1010" id="1268" >
+<cdparam x="143" y="237" />
+<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="wait event" value="pTS() " />
+<TGConnectingPoint num="0" id="1266" />
+<TGConnectingPoint num="1" id="1267" />
+<extraparam>
+<Data eventName="pTS" nbOfParams="5" />
+</extraparam>
+</COMPONENT>
 
-<COMPONENT type="1000" id="1306" >
-<cdparam x="517" y="87" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1271" >
+<cdparam x="121" y="308" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1305" />
+<infoparam name="send event" value="pTSConfirm()" />
+<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="1" id="1270" />
+<extraparam>
+<Data eventName="pTSConfirm" nbOfParams="5" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1308" >
-<cdparam x="417" y="367" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1288" >
+<cdparam x="376" y="98" />
+<sizeparam width="249" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1307" />
+<infoparam name="UML Note" value="The first two layers of the OSI model 
+are used to communicate between 
+the smart card and the terminal
+" />
+<TGConnectingPoint num="0" id="1272" />
+<TGConnectingPoint num="1" id="1273" />
+<TGConnectingPoint num="2" id="1274" />
+<TGConnectingPoint num="3" id="1275" />
+<TGConnectingPoint num="4" id="1276" />
+<TGConnectingPoint num="5" id="1277" />
+<TGConnectingPoint num="6" id="1278" />
+<TGConnectingPoint num="7" id="1279" />
+<TGConnectingPoint num="8" id="1280" />
+<TGConnectingPoint num="9" id="1281" />
+<TGConnectingPoint num="10" id="1282" />
+<TGConnectingPoint num="11" id="1283" />
+<TGConnectingPoint num="12" id="1284" />
+<TGConnectingPoint num="13" id="1285" />
+<TGConnectingPoint num="14" id="1286" />
+<TGConnectingPoint num="15" id="1287" />
+<extraparam>
+<Line value="The first two layers of the OSI model " />
+<Line value="are used to communicate between " />
+<Line value="the smart card and the terminal" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1311" >
-<cdparam x="393" y="299" />
-<sizeparam width="69" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1291" >
+<cdparam x="250" y="97" />
+<sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="timeOut()" />
-<TGConnectingPoint num="0" id="1309" />
-<TGConnectingPoint num="1" id="1310" />
+<infoparam name="send request" value="start_TCP_IP()" />
+<TGConnectingPoint num="0" id="1289" />
+<TGConnectingPoint num="1" id="1290" />
 <extraparam>
-<Data eventName="timeOut" nbOfParams="5" />
+<Data requestName="start_TCP_IP" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="1314" >
-<cdparam x="596" y="300" />
-<sizeparam width="52" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1007" id="1294" >
+<cdparam x="236" y="148" />
+<sizeparam width="125" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="wait event" value="stop() " />
-<TGConnectingPoint num="0" id="1312" />
-<TGConnectingPoint num="1" id="1313" />
+<infoparam name="send request" value="start_Application()" />
+<TGConnectingPoint num="0" id="1292" />
+<TGConnectingPoint num="1" id="1293" />
 <extraparam>
-<Data eventName="stop" nbOfParams="5" />
+<Data requestName="start_Application" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1316" >
-<cdparam x="612" y="365" />
+<COMPONENT type="1001" id="1296" >
+<cdparam x="515" y="428" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1315" />
+<TGConnectingPoint num="0" id="1295" />
 </COMPONENT>
 
-<COMPONENT type="1017" id="1319" >
-<cdparam x="487" y="150" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1299" >
+<cdparam x="305" y="350" />
+<sizeparam width="115" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="notified event" value="x=?stop()" />
-<TGConnectingPoint num="0" id="1317" />
-<TGConnectingPoint num="1" id="1318" />
+<infoparam name="send event" value="data_Ready_SC()" />
+<TGConnectingPoint num="0" id="1297" />
+<TGConnectingPoint num="1" id="1298" />
 <extraparam>
-<Data eventName="stop" variable="x" />
+<Data eventName="data_Ready_SC" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="1320" >
-<cdparam x="427" y="324" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1  x="427" y="324" id="1310" />
-<P2  x="427" y="362" id="1307" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1321" >
-<cdparam x="622" y="325" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from wait event to stop state" value="null" />
-<P1  x="622" y="325" id="1313" />
-<P2  x="622" y="360" id="1315" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1322" >
-<cdparam x="524" y="107" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to notified event" value="null" />
-<P1  x="524" y="107" id="1305" />
-<P2  x="524" y="145" id="1317" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1323" >
-<cdparam x="524" y="175" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from notified event to choice" value="null" />
-<P1  x="524" y="175" id="1318" />
-<P2  x="524" y="212" id="1300" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1324" >
-<cdparam x="484" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1  x="484" y="237" id="1301" />
-<P2  x="427" y="294" id="1309" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="115" id="1325" >
-<cdparam x="564" y="237" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to wait event" value="null" />
-<P1  x="564" y="237" id="1302" />
-<P2  x="622" y="295" id="1312" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-
-</TMLActivityDiagramPanel>
-
-<TMLActivityDiagramPanel name="Application" minX="10" maxX="1400" minY="10" maxY="900" >
-<COMPONENT type="1012" id="1333" >
-<cdparam x="491" y="277" />
-<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1001" id="1301" >
+<cdparam x="352" y="426" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1329" />
-<TGConnectingPoint num="1" id="1330" />
-<TGConnectingPoint num="2" id="1331" />
-<TGConnectingPoint num="3" id="1332" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1300" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="1326" >
-<father id="1333" num="0" />
-<cdparam x="466" y="287" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-75" maxX="-20" minY="10" maxY="35" />
-<infoparam name="guard 1" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1327" >
-<father id="1333" num="1" />
-<cdparam x="526" y="287" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="35" maxX="55" minY="10" maxY="35" />
-<infoparam name="guard 2" value="[ ]" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1328" >
-<father id="1333" num="2" />
-<cdparam x="511" y="322" />
-<sizeparam width="12" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+<COMPONENT type="1009" id="1304" >
+<cdparam x="318" y="308" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="20" maxX="40" minY="45" maxY="70" />
-<infoparam name="guard 3" value="[ ]" />
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="read channel" value="fromTtoP(1) " />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<extraparam>
+<Data channelName="fromTtoP" nbOfSamples="1" secPattern="" isAttacker="No" />
+</extraparam>
+</COMPONENT>
 
-<COMPONENT type="1000" id="1335" >
-<cdparam x="501" y="91" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1307" >
+<cdparam x="335" y="264" />
+<sizeparam width="55" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1334" />
+<infoparam name="wait event" value="send() " />
+<TGConnectingPoint num="0" id="1305" />
+<TGConnectingPoint num="1" id="1306" />
+<extraparam>
+<Data eventName="send" nbOfParams="5" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1338" >
-<cdparam x="485" y="129" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1310" >
+<cdparam x="315" y="392" />
+<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="open()" />
-<TGConnectingPoint num="0" id="1336" />
-<TGConnectingPoint num="1" id="1337" />
+<infoparam name="write channel" value="fromSCtoD(1)" />
+<TGConnectingPoint num="0" id="1308" />
+<TGConnectingPoint num="1" id="1309" />
 <extraparam>
-<Data eventName="open" nbOfParams="5" />
+<Data channelName="fromSCtoD" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="1341" >
-<cdparam x="468" y="178" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1008" id="1313" >
+<cdparam x="493" y="350" />
+<sizeparam width="65" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="write channel" value="fromAtoT(1)" />
-<TGConnectingPoint num="0" id="1339" />
-<TGConnectingPoint num="1" id="1340" />
+<infoparam name="send event" value="receive()" />
+<TGConnectingPoint num="0" id="1311" />
+<TGConnectingPoint num="1" id="1312" />
 <extraparam>
-<Data channelName="fromAtoT" nbOfSamples="1" secPattern="" />
+<Data eventName="receive" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1344" >
-<cdparam x="470" y="226" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1009" id="1316" >
+<cdparam x="476" y="311" />
+<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="send_TCP()" />
-<TGConnectingPoint num="0" id="1342" />
-<TGConnectingPoint num="1" id="1343" />
+<infoparam name="read channel" value="fromDtoSC(1) " />
+<TGConnectingPoint num="0" id="1314" />
+<TGConnectingPoint num="1" id="1315" />
 <extraparam>
-<Data eventName="send_TCP" nbOfParams="5" />
+<Data channelName="fromDtoSC" nbOfSamples="1" secPattern="" isAttacker="No" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1346" >
-<cdparam x="576" y="388" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1006" id="1319" >
+<cdparam x="483" y="387" />
+<sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1345" />
+<infoparam name="write channel" value="fromPtoT(1)" />
+<TGConnectingPoint num="0" id="1317" />
+<TGConnectingPoint num="1" id="1318" />
+<extraparam>
+<Data channelName="fromPtoT" nbOfSamples="1" secPattern="" isAttacker="No" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1349" >
-<cdparam x="562" y="329" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1010" id="1322" >
+<cdparam x="466" y="268" />
+<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="abort()" />
-<TGConnectingPoint num="0" id="1347" />
-<TGConnectingPoint num="1" id="1348" />
+<infoparam name="wait event" value="data_Ready(t, b) " />
+<TGConnectingPoint num="0" id="1320" />
+<TGConnectingPoint num="1" id="1321" />
+<breakpoint />
 <extraparam>
-<Data eventName="abort" nbOfParams="5" />
+<Data eventName="data_Ready" nbOfParams="5" />
+<Param index="0" value="t" />
+<Param index="1" value="b" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="1352" >
-<cdparam x="409" y="337" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="1014" id="1326" >
+<cdparam x="236" y="202" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="send event" value="close()" />
-<TGConnectingPoint num="0" id="1350" />
-<TGConnectingPoint num="1" id="1351" />
+<infoparam name="for loop" value="for(j=0;x==0;j = j)" />
+<TGConnectingPoint num="0" id="1323" />
+<TGConnectingPoint num="1" id="1324" />
+<TGConnectingPoint num="2" id="1325" />
 <extraparam>
-<Data eventName="close" nbOfParams="5" />
+<Data init="j=0" condition="x==0" increment="j = j" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="1354" >
-<cdparam x="422" y="386" />
+<COMPONENT type="1001" id="1328" >
+<cdparam x="297" y="231" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="1353" />
+<TGConnectingPoint num="0" id="1327" />
+</COMPONENT>
+
+<COMPONENT type="1018" id="1339" >
+<cdparam x="424" y="226" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="select" value="null" />
+<TGConnectingPoint num="0" id="1329" />
+<TGConnectingPoint num="1" id="1330" />
+<TGConnectingPoint num="2" id="1331" />
+<TGConnectingPoint num="3" id="1332" />
+<TGConnectingPoint num="4" id="1333" />
+<TGConnectingPoint num="5" id="1334" />
+<TGConnectingPoint num="6" id="1335" />
+<TGConnectingPoint num="7" id="1336" />
+<TGConnectingPoint num="8" id="1337" />
+<TGConnectingPoint num="9" id="1338" />
 </COMPONENT>
 
+<CONNECTOR type="115" id="1344" >
+<cdparam x="111" y="331" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to send request" value="null" />
+<P1  x="166" y="333" id="1270" />
+<P2  x="298" y="92" id="1289" />
+<Point x="166" y="351" />
+<Point x="231" y="351" />
+<Point x="231" y="72" />
+<Point x="298" y="72" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1340" >
+<father id="1344" num="0" />
+<cdparam x="166" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1341" >
+<father id="1344" num="1" />
+<cdparam x="231" y="351" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1342" >
+<father id="1344" num="2" />
+<cdparam x="231" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="-1" id="1343" >
+<father id="1344" num="3" />
+<cdparam x="298" y="72" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="point " value="null" />
+</SUBCOMPONENT>
+
+<CONNECTOR type="115" id="1345" >
+<cdparam x="166" y="64" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to wait event" value="null" />
+<P1  x="166" y="86" id="1258" />
+<P2  x="166" y="124" id="1260" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1346" >
+<cdparam x="166" y="154" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1  x="166" y="154" id="1261" />
+<P2  x="166" y="177" id="1263" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1347" >
+<cdparam x="312" y="133" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send request to send request" value="null" />
+<P1  x="298" y="122" id="1290" />
+<P2  x="298" y="143" id="1292" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1348" >
+<cdparam x="355" y="300" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1  x="362" y="289" id="1306" />
+<P2  x="362" y="303" id="1302" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1349" >
+<cdparam x="355" y="365" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1  x="362" y="333" id="1303" />
+<P2  x="362" y="345" id="1297" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1350" >
+<cdparam x="355" y="417" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1  x="362" y="375" id="1298" />
+<P2  x="362" y="387" id="1308" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1351" >
+<cdparam x="355" y="473" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1  x="362" y="417" id="1309" />
+<P2  x="362" y="421" id="1300" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1352" >
+<cdparam x="541" y="358" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from read channel to send event" value="null" />
+<P1  x="525" y="336" id="1315" />
+<P2  x="525" y="345" id="1311" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1353" >
+<cdparam x="540" y="402" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from send event to write channel" value="null" />
+<P1  x="525" y="375" id="1312" />
+<P2  x="525" y="382" id="1317" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="1354" >
+<cdparam x="543" y="305" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from wait event to read channel" value="null" />
+<P1  x="525" y="293" id="1321" />
+<P2  x="525" y="306" id="1314" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
 <CONNECTOR type="115" id="1355" >
-<cdparam x="509" y="94" />
+<cdparam x="540" y="464" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to send event" value="null" />
-<P1  x="508" y="111" id="1334" />
-<P2  x="508" y="124" id="1336" />
+<infoparam name="connector from write channel to stop state" value="null" />
+<P1  x="525" y="412" id="1318" />
+<P2  x="525" y="423" id="1295" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1356" >
-<cdparam x="508" y="154" />
+<cdparam x="298" y="173" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to write channel" value="null" />
-<P1  x="508" y="154" id="1337" />
-<P2  x="508" y="173" id="1339" />
+<infoparam name="connector from send request to for loop" value="null" />
+<P1  x="298" y="173" id="1293" />
+<P2  x="298" y="197" id="1323" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1357" >
-<cdparam x="508" y="222" />
+<cdparam x="328" y="232" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from write channel to send event" value="null" />
-<P1  x="508" y="203" id="1340" />
-<P2  x="507" y="221" id="1342" />
+<infoparam name="connector from for loop to stop state" value="null" />
+<P1  x="298" y="227" id="1325" />
+<P2  x="307" y="226" id="1327" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1358" >
-<cdparam x="586" y="354" />
+<cdparam x="395" y="283" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1  x="586" y="354" id="1348" />
-<P2  x="586" y="383" id="1345" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1  x="399" y="241" id="1330" />
+<P2  x="362" y="259" id="1305" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1359" >
-<cdparam x="508" y="298" />
+<cdparam x="543" y="341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to choice" value="null" />
-<P1  x="507" y="251" id="1343" />
-<P2  x="506" y="267" id="1329" />
+<infoparam name="connector from select to wait event" value="null" />
+<P1  x="479" y="241" id="1331" />
+<P2  x="525" y="263" id="1320" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1360" >
-<cdparam x="470" y="348" />
+<cdparam x="391" y="282" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1  x="466" y="292" id="1330" />
-<P2  x="432" y="332" id="1350" />
+<infoparam name="connector from for loop to select" value="null" />
+<P1  x="360" y="216" id="1324" />
+<P2  x="439" y="216" id="1329" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1361" >
-<cdparam x="432" y="362" />
+<cdparam x="164" y="262" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from send event to stop state" value="null" />
-<P1  x="432" y="362" id="1351" />
-<P2  x="432" y="381" id="1353" />
+<infoparam name="connector from wait event to send event" value="null" />
+<P1  x="166" y="262" id="1267" />
+<P2  x="166" y="303" id="1269" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="1362" >
-<cdparam x="550" y="348" />
+<cdparam x="166" y="207" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="600" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from choice to send event" value="null" />
-<P1  x="546" y="292" id="1331" />
-<P2  x="586" y="324" id="1347" />
+<infoparam name="connector from send event to wait event" value="null" />
+<P1  x="166" y="207" id="1264" />
+<P2  x="166" y="232" id="1266" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -6153,11 +6158,11 @@ On prend b=1 comme exemple
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="1371" >
 <father id="1432" num="0" />
-<cdparam x="226" y="304" />
-<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="92" y="154" />
+<sizeparam width="172" height="50" minWidth="75" minHeight="0" 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="287" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::InterfaceDevice" />
 <TGConnectingPoint num="0" id="1363" />
 <TGConnectingPoint num="1" id="1364" />
 <TGConnectingPoint num="2" id="1365" />
@@ -6167,16 +6172,16 @@ On prend b=1 comme exemple
 <TGConnectingPoint num="6" id="1369" />
 <TGConnectingPoint num="7" id="1370" />
 <extraparam>
-<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1380" >
 <father id="1432" num="1" />
-<cdparam x="290" y="234" />
-<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="291" y="153" />
+<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::Application" />
+<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
 <TGConnectingPoint num="0" id="1372" />
 <TGConnectingPoint num="1" id="1373" />
 <TGConnectingPoint num="2" id="1374" />
@@ -6186,7 +6191,7 @@ On prend b=1 comme exemple
 <TGConnectingPoint num="6" id="1378" />
 <TGConnectingPoint num="7" id="1379" />
 <extraparam>
-<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1389" >
@@ -6210,11 +6215,11 @@ On prend b=1 comme exemple
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1398" >
 <father id="1432" num="3" />
-<cdparam x="291" y="153" />
-<sizeparam width="141" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="290" y="234" />
+<sizeparam width="144" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="318" minY="0" maxY="271" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
+<cdrectangleparam minX="0" maxX="315" minY="0" maxY="271" />
+<infoparam name="TGComponent" value="AppC::Application" />
 <TGConnectingPoint num="0" id="1390" />
 <TGConnectingPoint num="1" id="1391" />
 <TGConnectingPoint num="2" id="1392" />
@@ -6224,16 +6229,16 @@ On prend b=1 comme exemple
 <TGConnectingPoint num="6" id="1396" />
 <TGConnectingPoint num="7" id="1397" />
 <extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="1407" >
 <father id="1432" num="4" />
-<cdparam x="92" y="154" />
-<sizeparam width="172" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="226" y="304" />
+<sizeparam width="109" height="50" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="287" 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="1399" />
 <TGConnectingPoint num="1" id="1400" />
 <TGConnectingPoint num="2" id="1401" />
@@ -6243,7 +6248,7 @@ On prend b=1 comme exemple
 <TGConnectingPoint num="6" id="1405" />
 <TGConnectingPoint num="7" id="1406" />
 <extraparam>
-<info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -6257,323 +6262,323 @@ On prend b=1 comme exemple
 
 <Modeling type="TML Architecture" nameTab="Mapping2" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="1400" minY="10" maxY="900" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1105" id="1458" >
+<COMPONENT type="1105" id="1457" >
 <cdparam x="420" y="527" />
 <sizeparam width="189" height="131" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1434" />
-<TGConnectingPoint num="1" id="1435" />
-<TGConnectingPoint num="2" id="1436" />
-<TGConnectingPoint num="3" id="1437" />
-<TGConnectingPoint num="4" id="1438" />
-<TGConnectingPoint num="5" id="1439" />
-<TGConnectingPoint num="6" id="1440" />
-<TGConnectingPoint num="7" id="1441" />
-<TGConnectingPoint num="8" id="1442" />
-<TGConnectingPoint num="9" id="1443" />
-<TGConnectingPoint num="10" id="1444" />
-<TGConnectingPoint num="11" id="1445" />
-<TGConnectingPoint num="12" id="1446" />
-<TGConnectingPoint num="13" id="1447" />
-<TGConnectingPoint num="14" id="1448" />
-<TGConnectingPoint num="15" id="1449" />
-<TGConnectingPoint num="16" id="1450" />
-<TGConnectingPoint num="17" id="1451" />
-<TGConnectingPoint num="18" id="1452" />
-<TGConnectingPoint num="19" id="1453" />
-<TGConnectingPoint num="20" id="1454" />
-<TGConnectingPoint num="21" id="1455" />
-<TGConnectingPoint num="22" id="1456" />
-<TGConnectingPoint num="23" id="1457" />
+<TGConnectingPoint num="0" id="1433" />
+<TGConnectingPoint num="1" id="1434" />
+<TGConnectingPoint num="2" id="1435" />
+<TGConnectingPoint num="3" id="1436" />
+<TGConnectingPoint num="4" id="1437" />
+<TGConnectingPoint num="5" id="1438" />
+<TGConnectingPoint num="6" id="1439" />
+<TGConnectingPoint num="7" id="1440" />
+<TGConnectingPoint num="8" id="1441" />
+<TGConnectingPoint num="9" id="1442" />
+<TGConnectingPoint num="10" id="1443" />
+<TGConnectingPoint num="11" id="1444" />
+<TGConnectingPoint num="12" id="1445" />
+<TGConnectingPoint num="13" id="1446" />
+<TGConnectingPoint num="14" id="1447" />
+<TGConnectingPoint num="15" id="1448" />
+<TGConnectingPoint num="16" id="1449" />
+<TGConnectingPoint num="17" id="1450" />
+<TGConnectingPoint num="18" id="1451" />
+<TGConnectingPoint num="19" id="1452" />
+<TGConnectingPoint num="20" id="1453" />
+<TGConnectingPoint num="21" id="1454" />
+<TGConnectingPoint num="22" id="1455" />
+<TGConnectingPoint num="23" id="1456" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1102" id="1483" >
+<COMPONENT type="1102" id="1482" >
 <cdparam x="389" y="438" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1459" />
-<TGConnectingPoint num="1" id="1460" />
-<TGConnectingPoint num="2" id="1461" />
-<TGConnectingPoint num="3" id="1462" />
-<TGConnectingPoint num="4" id="1463" />
-<TGConnectingPoint num="5" id="1464" />
-<TGConnectingPoint num="6" id="1465" />
-<TGConnectingPoint num="7" id="1466" />
-<TGConnectingPoint num="8" id="1467" />
-<TGConnectingPoint num="9" id="1468" />
-<TGConnectingPoint num="10" id="1469" />
-<TGConnectingPoint num="11" id="1470" />
-<TGConnectingPoint num="12" id="1471" />
-<TGConnectingPoint num="13" id="1472" />
-<TGConnectingPoint num="14" id="1473" />
-<TGConnectingPoint num="15" id="1474" />
-<TGConnectingPoint num="16" id="1475" />
-<TGConnectingPoint num="17" id="1476" />
-<TGConnectingPoint num="18" id="1477" />
-<TGConnectingPoint num="19" id="1478" />
-<TGConnectingPoint num="20" id="1479" />
-<TGConnectingPoint num="21" id="1480" />
-<TGConnectingPoint num="22" id="1481" />
-<TGConnectingPoint num="23" id="1482" />
+<TGConnectingPoint num="0" id="1458" />
+<TGConnectingPoint num="1" id="1459" />
+<TGConnectingPoint num="2" id="1460" />
+<TGConnectingPoint num="3" id="1461" />
+<TGConnectingPoint num="4" id="1462" />
+<TGConnectingPoint num="5" id="1463" />
+<TGConnectingPoint num="6" id="1464" />
+<TGConnectingPoint num="7" id="1465" />
+<TGConnectingPoint num="8" id="1466" />
+<TGConnectingPoint num="9" id="1467" />
+<TGConnectingPoint num="10" id="1468" />
+<TGConnectingPoint num="11" id="1469" />
+<TGConnectingPoint num="12" id="1470" />
+<TGConnectingPoint num="13" id="1471" />
+<TGConnectingPoint num="14" id="1472" />
+<TGConnectingPoint num="15" id="1473" />
+<TGConnectingPoint num="16" id="1474" />
+<TGConnectingPoint num="17" id="1475" />
+<TGConnectingPoint num="18" id="1476" />
+<TGConnectingPoint num="19" id="1477" />
+<TGConnectingPoint num="20" id="1478" />
+<TGConnectingPoint num="21" id="1479" />
+<TGConnectingPoint num="22" id="1480" />
+<TGConnectingPoint num="23" id="1481" />
 <extraparam>
 <info stereotype="BUS-RR" nodeName="Bus0" />
-<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="5"  privacy="0" />
+<attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="5"  privacy="0"  referenceAttack="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="1517" >
+<COMPONENT type="1100" id="1516" >
 <cdparam x="685" y="396" />
 <sizeparam width="174" height="135" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU2" value="name" />
-<TGConnectingPoint num="0" id="1493" />
-<TGConnectingPoint num="1" id="1494" />
-<TGConnectingPoint num="2" id="1495" />
-<TGConnectingPoint num="3" id="1496" />
-<TGConnectingPoint num="4" id="1497" />
-<TGConnectingPoint num="5" id="1498" />
-<TGConnectingPoint num="6" id="1499" />
-<TGConnectingPoint num="7" id="1500" />
-<TGConnectingPoint num="8" id="1501" />
-<TGConnectingPoint num="9" id="1502" />
-<TGConnectingPoint num="10" id="1503" />
-<TGConnectingPoint num="11" id="1504" />
-<TGConnectingPoint num="12" id="1505" />
-<TGConnectingPoint num="13" id="1506" />
-<TGConnectingPoint num="14" id="1507" />
-<TGConnectingPoint num="15" id="1508" />
-<TGConnectingPoint num="16" id="1509" />
-<TGConnectingPoint num="17" id="1510" />
-<TGConnectingPoint num="18" id="1511" />
-<TGConnectingPoint num="19" id="1512" />
-<TGConnectingPoint num="20" id="1513" />
-<TGConnectingPoint num="21" id="1514" />
-<TGConnectingPoint num="22" id="1515" />
-<TGConnectingPoint num="23" id="1516" />
+<TGConnectingPoint num="0" id="1492" />
+<TGConnectingPoint num="1" id="1493" />
+<TGConnectingPoint num="2" id="1494" />
+<TGConnectingPoint num="3" id="1495" />
+<TGConnectingPoint num="4" id="1496" />
+<TGConnectingPoint num="5" id="1497" />
+<TGConnectingPoint num="6" id="1498" />
+<TGConnectingPoint num="7" id="1499" />
+<TGConnectingPoint num="8" id="1500" />
+<TGConnectingPoint num="9" id="1501" />
+<TGConnectingPoint num="10" id="1502" />
+<TGConnectingPoint num="11" id="1503" />
+<TGConnectingPoint num="12" id="1504" />
+<TGConnectingPoint num="13" id="1505" />
+<TGConnectingPoint num="14" id="1506" />
+<TGConnectingPoint num="15" id="1507" />
+<TGConnectingPoint num="16" id="1508" />
+<TGConnectingPoint num="17" id="1509" />
+<TGConnectingPoint num="18" id="1510" />
+<TGConnectingPoint num="19" id="1511" />
+<TGConnectingPoint num="20" id="1512" />
+<TGConnectingPoint num="21" id="1513" />
+<TGConnectingPoint num="22" id="1514" />
+<TGConnectingPoint num="23" id="1515" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU2" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="4" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1492" >
-<father id="1517" num="0" />
+<SUBCOMPONENT type="1101" id="1491" >
+<father id="1516" num="0" />
 <cdparam x="715" y="448" />
 <sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="65" minY="0" maxY="95" />
 <infoparam name="TGComponent" value="AppC::Timer" />
-<TGConnectingPoint num="0" id="1484" />
-<TGConnectingPoint num="1" id="1485" />
-<TGConnectingPoint num="2" id="1486" />
-<TGConnectingPoint num="3" id="1487" />
-<TGConnectingPoint num="4" id="1488" />
-<TGConnectingPoint num="5" id="1489" />
-<TGConnectingPoint num="6" id="1490" />
-<TGConnectingPoint num="7" id="1491" />
+<TGConnectingPoint num="0" id="1483" />
+<TGConnectingPoint num="1" id="1484" />
+<TGConnectingPoint num="2" id="1485" />
+<TGConnectingPoint num="3" id="1486" />
+<TGConnectingPoint num="4" id="1487" />
+<TGConnectingPoint num="5" id="1488" />
+<TGConnectingPoint num="6" id="1489" />
+<TGConnectingPoint num="7" id="1490" />
 <extraparam>
 <info value="AppC::Timer" taskName="Timer" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1551" >
+<COMPONENT type="1100" id="1550" >
 <cdparam x="167" y="400" />
 <sizeparam width="165" height="126" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU1" value="name" />
-<TGConnectingPoint num="0" id="1527" />
-<TGConnectingPoint num="1" id="1528" />
-<TGConnectingPoint num="2" id="1529" />
-<TGConnectingPoint num="3" id="1530" />
-<TGConnectingPoint num="4" id="1531" />
-<TGConnectingPoint num="5" id="1532" />
-<TGConnectingPoint num="6" id="1533" />
-<TGConnectingPoint num="7" id="1534" />
-<TGConnectingPoint num="8" id="1535" />
-<TGConnectingPoint num="9" id="1536" />
-<TGConnectingPoint num="10" id="1537" />
-<TGConnectingPoint num="11" id="1538" />
-<TGConnectingPoint num="12" id="1539" />
-<TGConnectingPoint num="13" id="1540" />
-<TGConnectingPoint num="14" id="1541" />
-<TGConnectingPoint num="15" id="1542" />
-<TGConnectingPoint num="16" id="1543" />
-<TGConnectingPoint num="17" id="1544" />
-<TGConnectingPoint num="18" id="1545" />
-<TGConnectingPoint num="19" id="1546" />
-<TGConnectingPoint num="20" id="1547" />
-<TGConnectingPoint num="21" id="1548" />
-<TGConnectingPoint num="22" id="1549" />
-<TGConnectingPoint num="23" id="1550" />
+<TGConnectingPoint num="0" id="1526" />
+<TGConnectingPoint num="1" id="1527" />
+<TGConnectingPoint num="2" id="1528" />
+<TGConnectingPoint num="3" id="1529" />
+<TGConnectingPoint num="4" id="1530" />
+<TGConnectingPoint num="5" id="1531" />
+<TGConnectingPoint num="6" id="1532" />
+<TGConnectingPoint num="7" id="1533" />
+<TGConnectingPoint num="8" id="1534" />
+<TGConnectingPoint num="9" id="1535" />
+<TGConnectingPoint num="10" id="1536" />
+<TGConnectingPoint num="11" id="1537" />
+<TGConnectingPoint num="12" id="1538" />
+<TGConnectingPoint num="13" id="1539" />
+<TGConnectingPoint num="14" id="1540" />
+<TGConnectingPoint num="15" id="1541" />
+<TGConnectingPoint num="16" id="1542" />
+<TGConnectingPoint num="17" id="1543" />
+<TGConnectingPoint num="18" id="1544" />
+<TGConnectingPoint num="19" id="1545" />
+<TGConnectingPoint num="20" id="1546" />
+<TGConnectingPoint num="21" id="1547" />
+<TGConnectingPoint num="22" id="1548" />
+<TGConnectingPoint num="23" id="1549" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU1" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="2" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1526" >
-<father id="1551" num="0" />
+<SUBCOMPONENT type="1101" id="1525" >
+<father id="1550" num="0" />
 <cdparam x="160" y="445" />
 <sizeparam width="172" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" />
 <infoparam name="TGComponent" value="AppC::InterfaceDevice" />
-<TGConnectingPoint num="0" id="1518" />
-<TGConnectingPoint num="1" id="1519" />
-<TGConnectingPoint num="2" id="1520" />
-<TGConnectingPoint num="3" id="1521" />
-<TGConnectingPoint num="4" id="1522" />
-<TGConnectingPoint num="5" id="1523" />
-<TGConnectingPoint num="6" id="1524" />
-<TGConnectingPoint num="7" id="1525" />
+<TGConnectingPoint num="0" id="1517" />
+<TGConnectingPoint num="1" id="1518" />
+<TGConnectingPoint num="2" id="1519" />
+<TGConnectingPoint num="3" id="1520" />
+<TGConnectingPoint num="4" id="1521" />
+<TGConnectingPoint num="5" id="1522" />
+<TGConnectingPoint num="6" id="1523" />
+<TGConnectingPoint num="7" id="1524" />
 <extraparam>
 <info value="AppC::InterfaceDevice" taskName="InterfaceDevice" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1100" id="1603" >
+<COMPONENT type="1100" id="1602" >
 <cdparam x="389" y="243" />
 <sizeparam width="250" height="146" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="1579" />
-<TGConnectingPoint num="1" id="1580" />
-<TGConnectingPoint num="2" id="1581" />
-<TGConnectingPoint num="3" id="1582" />
-<TGConnectingPoint num="4" id="1583" />
-<TGConnectingPoint num="5" id="1584" />
-<TGConnectingPoint num="6" id="1585" />
-<TGConnectingPoint num="7" id="1586" />
-<TGConnectingPoint num="8" id="1587" />
-<TGConnectingPoint num="9" id="1588" />
-<TGConnectingPoint num="10" id="1589" />
-<TGConnectingPoint num="11" id="1590" />
-<TGConnectingPoint num="12" id="1591" />
-<TGConnectingPoint num="13" id="1592" />
-<TGConnectingPoint num="14" id="1593" />
-<TGConnectingPoint num="15" id="1594" />
-<TGConnectingPoint num="16" id="1595" />
-<TGConnectingPoint num="17" id="1596" />
-<TGConnectingPoint num="18" id="1597" />
-<TGConnectingPoint num="19" id="1598" />
-<TGConnectingPoint num="20" id="1599" />
-<TGConnectingPoint num="21" id="1600" />
-<TGConnectingPoint num="22" id="1601" />
-<TGConnectingPoint num="23" id="1602" />
+<TGConnectingPoint num="0" id="1578" />
+<TGConnectingPoint num="1" id="1579" />
+<TGConnectingPoint num="2" id="1580" />
+<TGConnectingPoint num="3" id="1581" />
+<TGConnectingPoint num="4" id="1582" />
+<TGConnectingPoint num="5" id="1583" />
+<TGConnectingPoint num="6" id="1584" />
+<TGConnectingPoint num="7" id="1585" />
+<TGConnectingPoint num="8" id="1586" />
+<TGConnectingPoint num="9" id="1587" />
+<TGConnectingPoint num="10" id="1588" />
+<TGConnectingPoint num="11" id="1589" />
+<TGConnectingPoint num="12" id="1590" />
+<TGConnectingPoint num="13" id="1591" />
+<TGConnectingPoint num="14" id="1592" />
+<TGConnectingPoint num="15" id="1593" />
+<TGConnectingPoint num="16" id="1594" />
+<TGConnectingPoint num="17" id="1595" />
+<TGConnectingPoint num="18" id="1596" />
+<TGConnectingPoint num="19" id="1597" />
+<TGConnectingPoint num="20" id="1598" />
+<TGConnectingPoint num="21" id="1599" />
+<TGConnectingPoint num="22" id="1600" />
+<TGConnectingPoint num="23" id="1601" />
 <extraparam>
 <info stereotype="CPURR" nodeName="CPU0" />
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="0"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="18" execiTime="1" execcTime="1" clockRatio="3" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="1560" >
-<father id="1603" num="0" />
-<cdparam x="486" y="303" />
-<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1559" >
+<father id="1602" num="0" />
+<cdparam x="396" y="258" />
+<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="109" minY="0" maxY="106" />
-<infoparam name="TGComponent" value="AppC::SmartCard" />
-<TGConnectingPoint num="0" id="1552" />
-<TGConnectingPoint num="1" id="1553" />
-<TGConnectingPoint num="2" id="1554" />
-<TGConnectingPoint num="3" id="1555" />
-<TGConnectingPoint num="4" id="1556" />
-<TGConnectingPoint num="5" id="1557" />
-<TGConnectingPoint num="6" id="1558" />
-<TGConnectingPoint num="7" id="1559" />
+<cdrectangleparam minX="0" maxX="141" minY="0" maxY="106" />
+<infoparam name="TGComponent" value="AppC::TCPIP" />
+<TGConnectingPoint num="0" id="1551" />
+<TGConnectingPoint num="1" id="1552" />
+<TGConnectingPoint num="2" id="1553" />
+<TGConnectingPoint num="3" id="1554" />
+<TGConnectingPoint num="4" id="1555" />
+<TGConnectingPoint num="5" id="1556" />
+<TGConnectingPoint num="6" id="1557" />
+<TGConnectingPoint num="7" id="1558" />
 <extraparam>
-<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1569" >
-<father id="1603" num="1" />
+<SUBCOMPONENT type="1101" id="1568" >
+<father id="1602" num="1" />
 <cdparam x="415" y="349" />
 <sizeparam width="144" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="106" minY="0" maxY="106" />
 <infoparam name="TGComponent" value="AppC::Application" />
-<TGConnectingPoint num="0" id="1561" />
-<TGConnectingPoint num="1" id="1562" />
-<TGConnectingPoint num="2" id="1563" />
-<TGConnectingPoint num="3" id="1564" />
-<TGConnectingPoint num="4" id="1565" />
-<TGConnectingPoint num="5" id="1566" />
-<TGConnectingPoint num="6" id="1567" />
-<TGConnectingPoint num="7" id="1568" />
+<TGConnectingPoint num="0" id="1560" />
+<TGConnectingPoint num="1" id="1561" />
+<TGConnectingPoint num="2" id="1562" />
+<TGConnectingPoint num="3" id="1563" />
+<TGConnectingPoint num="4" id="1564" />
+<TGConnectingPoint num="5" id="1565" />
+<TGConnectingPoint num="6" id="1566" />
+<TGConnectingPoint num="7" id="1567" />
 <extraparam>
 <info value="AppC::Application" taskName="Application" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="1578" >
-<father id="1603" num="2" />
-<cdparam x="396" y="258" />
-<sizeparam width="109" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="1101" id="1577" >
+<father id="1602" num="2" />
+<cdparam x="486" y="303" />
+<sizeparam width="141" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="141" minY="0" maxY="106" />
-<infoparam name="TGComponent" value="AppC::TCPIP" />
-<TGConnectingPoint num="0" id="1570" />
-<TGConnectingPoint num="1" id="1571" />
-<TGConnectingPoint num="2" id="1572" />
-<TGConnectingPoint num="3" id="1573" />
-<TGConnectingPoint num="4" id="1574" />
-<TGConnectingPoint num="5" id="1575" />
-<TGConnectingPoint num="6" id="1576" />
-<TGConnectingPoint num="7" id="1577" />
+<cdrectangleparam minX="0" maxX="109" minY="0" maxY="106" />
+<infoparam name="TGComponent" value="AppC::SmartCard" />
+<TGConnectingPoint num="0" id="1569" />
+<TGConnectingPoint num="1" id="1570" />
+<TGConnectingPoint num="2" id="1571" />
+<TGConnectingPoint num="3" id="1572" />
+<TGConnectingPoint num="4" id="1573" />
+<TGConnectingPoint num="5" id="1574" />
+<TGConnectingPoint num="6" id="1575" />
+<TGConnectingPoint num="7" id="1576" />
 <extraparam>
-<info value="AppC::TCPIP" taskName="TCPIP" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
+<info value="AppC::SmartCard" taskName="SmartCard" referenceTaskName="AppC" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="1604" >
+<CONNECTOR type="125" id="1603" >
 <cdparam x="513" y="536" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Memory0 to Bus0" value="{info}" />
-<P1  x="514" y="527" id="1435" />
-<P2  x="514" y="488" id="1465" />
+<P1  x="514" y="527" id="1434" />
+<P2  x="514" y="488" id="1464" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1605" >
+<CONNECTOR type="125" id="1604" >
 <cdparam x="301" y="469" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU1 to Bus0" value="{info}" />
-<P1  x="332" y="463" id="1531" />
-<P2  x="389" y="463" id="1462" />
+<P1  x="332" y="463" id="1530" />
+<P2  x="389" y="463" id="1461" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1606" >
+<CONNECTOR type="125" id="1605" >
 <cdparam x="773" y="479" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU2 to Bus0" value="{info}" />
-<P1  x="685" y="463" id="1496" />
-<P2  x="639" y="463" id="1463" />
+<P1  x="685" y="463" id="1495" />
+<P2  x="639" y="463" id="1462" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="1607" >
+<CONNECTOR type="125" id="1606" >
 <cdparam x="499" y="331" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from CPU0 to Bus0" value="{info}" />
-<P1  x="514" y="389" id="1585" />
-<P2  x="514" y="438" id="1460" />
+<P1  x="514" y="389" id="1584" />
+<P2  x="514" y="438" id="1459" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -6590,101 +6595,101 @@ On prend b=1 comme exemple
 
 <Modeling type="Diplodocus Methodology" nameTab="DIPLODOCUS_Methodology" >
 <DiplodocusMethodologyDiagramPanel name="DIPLODOCUS_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="6003" id="1612" >
+<COMPONENT type="6003" id="1611" >
 <cdparam x="60" y="417" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Requirements" />
-<TGConnectingPoint num="0" id="1608" />
-<TGConnectingPoint num="1" id="1609" />
-<TGConnectingPoint num="2" id="1610" />
-<TGConnectingPoint num="3" id="1611" />
+<TGConnectingPoint num="0" id="1607" />
+<TGConnectingPoint num="1" id="1608" />
+<TGConnectingPoint num="2" id="1609" />
+<TGConnectingPoint num="3" id="1610" />
 </COMPONENT>
 
-<COMPONENT type="6006" id="1617" >
+<COMPONENT type="6006" id="1616" >
 <cdparam x="600" y="100" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Com. Patterns" />
-<TGConnectingPoint num="0" id="1613" />
-<TGConnectingPoint num="1" id="1614" />
-<TGConnectingPoint num="2" id="1615" />
-<TGConnectingPoint num="3" id="1616" />
+<TGConnectingPoint num="0" id="1612" />
+<TGConnectingPoint num="1" id="1613" />
+<TGConnectingPoint num="2" id="1614" />
+<TGConnectingPoint num="3" id="1615" />
 </COMPONENT>
 
-<COMPONENT type="6002" id="1626" >
+<COMPONENT type="6002" id="1625" >
 <cdparam x="518" y="306" />
 <sizeparam width="318" height="136" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Mapping" />
-<TGConnectingPoint num="0" id="1620" />
-<TGConnectingPoint num="1" id="1621" />
-<TGConnectingPoint num="2" id="1622" />
-<TGConnectingPoint num="3" id="1623" />
-<TGConnectingPoint num="4" id="1624" />
-<TGConnectingPoint num="5" id="1625" />
-</COMPONENT>
+<TGConnectingPoint num="0" id="1619" />
+<TGConnectingPoint num="1" id="1620" />
+<TGConnectingPoint num="2" id="1621" />
+<TGConnectingPoint num="3" id="1622" />
+<TGConnectingPoint num="4" id="1623" />
+<TGConnectingPoint num="5" id="1624" />
+</COMPONENT>
+<SUBCOMPONENT type="6005" id="1617" >
+<father id="1625" num="0" />
+<cdparam x="523" y="346" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
+<infoparam name="value " value="Mapping1" />
+</SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="1618" >
-<father id="1626" num="0" />
+<father id="1625" num="1" />
 <cdparam x="523" y="361" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="605" maxX="605" minY="355" maxY="355" />
 <infoparam name="value " value="Mapping2" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1619" >
-<father id="1626" num="1" />
-<cdparam x="523" y="346" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="605" maxX="605" minY="340" maxY="340" />
-<infoparam name="value " value="Mapping1" />
-</SUBCOMPONENT>
 
-<COMPONENT type="6001" id="1633" >
+<COMPONENT type="6001" id="1632" >
 <cdparam x="850" y="100" />
 <sizeparam width="200" height="120" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Architecture" />
-<TGConnectingPoint num="0" id="1629" />
-<TGConnectingPoint num="1" id="1630" />
-<TGConnectingPoint num="2" id="1631" />
-<TGConnectingPoint num="3" id="1632" />
+<TGConnectingPoint num="0" id="1628" />
+<TGConnectingPoint num="1" id="1629" />
+<TGConnectingPoint num="2" id="1630" />
+<TGConnectingPoint num="3" id="1631" />
 </COMPONENT>
+<SUBCOMPONENT type="6005" id="1626" >
+<father id="1632" num="0" />
+<cdparam x="855" y="140" />
+<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
+<infoparam name="value " value="Mapping1" />
+</SUBCOMPONENT>
 <SUBCOMPONENT type="6005" id="1627" >
-<father id="1633" num="0" />
+<father id="1632" num="1" />
 <cdparam x="855" y="155" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="855" maxX="855" minY="155" maxY="155" />
 <infoparam name="value " value="Mapping2" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="6005" id="1628" >
-<father id="1633" num="1" />
-<cdparam x="855" y="140" />
-<sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="855" maxX="855" minY="140" maxY="140" />
-<infoparam name="value " value="Mapping1" />
-</SUBCOMPONENT>
 
-<COMPONENT type="6000" id="1639" >
+<COMPONENT type="6000" id="1638" >
 <cdparam x="233" y="101" />
 <sizeparam width="334" height="161" minWidth="10" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="Application" />
-<TGConnectingPoint num="0" id="1635" />
-<TGConnectingPoint num="1" id="1636" />
-<TGConnectingPoint num="2" id="1637" />
-<TGConnectingPoint num="3" id="1638" />
+<TGConnectingPoint num="0" id="1634" />
+<TGConnectingPoint num="1" id="1635" />
+<TGConnectingPoint num="2" id="1636" />
+<TGConnectingPoint num="3" id="1637" />
 </COMPONENT>
-<SUBCOMPONENT type="6005" id="1634" >
-<father id="1639" num="0" />
+<SUBCOMPONENT type="6005" id="1633" >
+<father id="1638" num="0" />
 <cdparam x="238" y="141" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -6692,31 +6697,31 @@ On prend b=1 comme exemple
 <infoparam name="value " value="AppC" />
 </SUBCOMPONENT>
 
-<CONNECTOR type="6004" id="1641" >
+<CONNECTOR type="6004" id="1640" >
 <cdparam x="950" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1640" />
-<P1  x="950" y="220" id="1629" />
-<P2  x="740" y="306" id="1621" />
+<TGConnectingPoint num="0" id="1639" />
+<P1  x="950" y="220" id="1628" />
+<P2  x="740" y="306" id="1620" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="6004" id="1643" >
+<CONNECTOR type="6004" id="1642" >
 <cdparam x="700" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1642" />
-<P1  x="700" y="220" id="1613" />
-<P2  x="677" y="306" id="1622" />
+<TGConnectingPoint num="0" id="1641" />
+<P1  x="700" y="220" id="1612" />
+<P2  x="677" y="306" id="1621" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="6004" id="1645" >
+<CONNECTOR type="6004" id="1644" >
 <cdparam x="450" y="220" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="&lt;&lt;deriveReqt&gt;&gt;" />
-<TGConnectingPoint num="0" id="1644" />
-<P1  x="400" y="262" id="1635" />
-<P2  x="613" y="306" id="1620" />
+<TGConnectingPoint num="0" id="1643" />
+<P1  x="400" y="262" id="1634" />
+<P2  x="613" y="306" id="1619" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
diff --git a/src/main/java/ui/window/JDialogADDBusNode.java b/src/main/java/ui/window/JDialogADDBusNode.java
index 83b09fb7991633051f7398cd658d194e56e44a15..af763730bbd582b53063a139a60abe5e720dc99f 100755
--- a/src/main/java/ui/window/JDialogADDBusNode.java
+++ b/src/main/java/ui/window/JDialogADDBusNode.java
@@ -74,11 +74,6 @@ public class JDialogADDBusNode extends JDialogBase implements ActionListener  {
 	
 	// Panel2
     protected JTextField index, nbOfAttachedInitiators, nbOfAttachedTargets, fifoDepth, minLatency;
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogADDBusNode(Frame _frame, String _title, ADDBusNode _node) {
@@ -176,7 +171,7 @@ public class JDialogADDBusNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDCPUNode.java b/src/main/java/ui/window/JDialogADDCPUNode.java
index 0ebdcd3f8a8dcfcfad545740313c4403079952d9..8536888e6f8c56188388ff805fe51517211caadc 100755
--- a/src/main/java/ui/window/JDialogADDCPUNode.java
+++ b/src/main/java/ui/window/JDialogADDCPUNode.java
@@ -80,10 +80,6 @@ public class JDialogADDCPUNode extends JDialogBase implements ActionListener {
 	protected JTextField nbOfIrq, iCacheWays, iCacheSets, iCacheWords, dCacheWays, dCacheSets, dCacheWords;
 	 protected JTextField index;
 	 protected JTextField monitored;	
-
-	// Main Panel
-	private JButton closeButton;
-	private JButton cancelButton;
 	
 	/** Creates new form  */
 	public JDialogADDCPUNode(Frame _frame, String _title, ADDCPUNode _node) {
@@ -212,7 +208,7 @@ public class JDialogADDCPUNode extends JDialogBase implements ActionListener {
 		c0.gridheight = 1;
 		c0.fill = GridBagConstraints.HORIZONTAL;
 		
-		initButtons(closeButton, cancelButton, c0, c, this);
+		initButtons(c0, c, this);
 	}
 	
 	public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDCoproMWMRNode.java b/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
index 648b6e042136c08d07ed0a10d17931ac48d69961..e5d41997fa1dcac3bb97c48aaf3b1c913c7bd745 100755
--- a/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
+++ b/src/main/java/ui/window/JDialogADDCoproMWMRNode.java
@@ -86,11 +86,6 @@ public class JDialogADDCoproMWMRNode extends JDialogBase implements ActionListen
 		private String[] choices = { "false", "true"};
 		private JComboBox<String> useLLSC;
 		
-		
-		// Main Panel
-		private JButton closeButton;
-		private JButton cancelButton;
-		
 		/** Creates new form  */
 		public JDialogADDCoproMWMRNode(Frame _frame, String _title, ADDCoproMWMRNode _node) {
 				super(_frame, _title, true);
@@ -194,7 +189,7 @@ public class JDialogADDCoproMWMRNode extends JDialogBase implements ActionListen
 				c0.gridheight = 1;
 				c0.fill = GridBagConstraints.HORIZONTAL;
 				
-				initButtons(closeButton, cancelButton, c0, c, this);
+				initButtons(c0, c, this);
 		}
 		
 		public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDCrossbarNode.java b/src/main/java/ui/window/JDialogADDCrossbarNode.java
index 470ce6ebc99a22bf50c2fbaab28b28bc5d0cee92..476ebfd08cc703208b7471272aa9085cd86905a9 100755
--- a/src/main/java/ui/window/JDialogADDCrossbarNode.java
+++ b/src/main/java/ui/window/JDialogADDCrossbarNode.java
@@ -75,11 +75,7 @@ public class JDialogADDCrossbarNode extends JDialogBase implements ActionListene
 	// Panel2
     //protected JTextField index, nbOfAttachedInitiators, nbOfAttachedTargets, cluster_index, cluster_address;
     	protected JTextField cluster_index, cluster_address;
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
+
     /** Creates new form  */
     public JDialogADDCrossbarNode(Frame _frame, String _title, ADDCrossbarNode _node) {
         super(_frame, _title, true);
@@ -176,7 +172,7 @@ public class JDialogADDCrossbarNode extends JDialogBase implements ActionListene
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDICUNode.java b/src/main/java/ui/window/JDialogADDICUNode.java
index 955f21bc7163da3e1957d9a2f009904b1a79e3a5..d472d066fd920e5a379cc0f73f02d69cb77bb497 100755
--- a/src/main/java/ui/window/JDialogADDICUNode.java
+++ b/src/main/java/ui/window/JDialogADDICUNode.java
@@ -76,12 +76,6 @@ public class JDialogADDICUNode extends JDialogBase implements ActionListener  {
     protected JTextField index;
     protected JTextField nIrq;
     
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogADDICUNode(Frame _frame, String _title, ADDICUNode _node) {
         super(_frame, _title, true);
@@ -160,7 +154,7 @@ public class JDialogADDICUNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDMemoryNode.java b/src/main/java/ui/window/JDialogADDMemoryNode.java
index 29ee1df8cc0523a9128f278d98306733746f5e73..947a4b830b4ad3bb2cfaa0e6b847cecb06bfdea7 100755
--- a/src/main/java/ui/window/JDialogADDMemoryNode.java
+++ b/src/main/java/ui/window/JDialogADDMemoryNode.java
@@ -81,10 +81,6 @@ public class JDialogADDMemoryNode extends JDialogBase implements ActionListener
     protected JTextField dataSize;
     protected JTextField monitored;	
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogADDMemoryNode(Frame _frame, String _title, ADDMemoryNode _node) {
         super(_frame, _title, true);
@@ -177,7 +173,7 @@ public class JDialogADDMemoryNode extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDTTYNode.java b/src/main/java/ui/window/JDialogADDTTYNode.java
index ac982b91b1d1a9d799143bd8219447415bac9ae8..ff8b91e8b0ad6d247f321f828a088b9e3dd260e0 100755
--- a/src/main/java/ui/window/JDialogADDTTYNode.java
+++ b/src/main/java/ui/window/JDialogADDTTYNode.java
@@ -74,11 +74,6 @@ public class JDialogADDTTYNode extends JDialogBase implements ActionListener  {
 	
 	// Panel2
     protected JTextField index;
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogADDTTYNode(Frame _frame, String _title, ADDTTYNode _node) {
@@ -152,7 +147,7 @@ public class JDialogADDTTYNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDTimerNode.java b/src/main/java/ui/window/JDialogADDTimerNode.java
index fbcc55c2215072ac4dcf79429549136c41d98fdf..efa25e567503044d22c6fc7fbe9dfa21054945db 100755
--- a/src/main/java/ui/window/JDialogADDTimerNode.java
+++ b/src/main/java/ui/window/JDialogADDTimerNode.java
@@ -76,12 +76,6 @@ public class JDialogADDTimerNode extends JDialogBase implements ActionListener
     protected JTextField index;
     protected JTextField nIrq;
     
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogADDTimerNode(Frame _frame, String _title, ADDTimerNode _node) {
         super(_frame, _title, true);
@@ -160,7 +154,7 @@ public class JDialogADDTimerNode extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogADDVgmnNode.java b/src/main/java/ui/window/JDialogADDVgmnNode.java
index 9fef5379663d709a25513d22f128f250822242ad..5c8d725aff5ba826f6c6ac4044b6b6d98af2fdab 100755
--- a/src/main/java/ui/window/JDialogADDVgmnNode.java
+++ b/src/main/java/ui/window/JDialogADDVgmnNode.java
@@ -74,11 +74,6 @@ public class JDialogADDVgmnNode extends JDialogBase implements ActionListener  {
 	
 	// Panel2
     protected JTextField index, nbOfAttachedInitiators, nbOfAttachedTargets, fifoDepth, minLatency;
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogADDVgmnNode(Frame _frame, String _title, ADDVgmnNode _node) {
@@ -177,7 +172,7 @@ public class JDialogADDVgmnNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
        
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogArchiKey.java b/src/main/java/ui/window/JDialogArchiKey.java
index e2bc9d4458c6d70a09ee9722929945e14ecc72e1..5efad1f8c9210c439b132b7ee31f3c691dd660ae 100644
--- a/src/main/java/ui/window/JDialogArchiKey.java
+++ b/src/main/java/ui/window/JDialogArchiKey.java
@@ -72,10 +72,6 @@ public class JDialogArchiKey extends JDialogBase implements ActionListener  {
     private TMLArchiKey artifact;
     
 	protected JComboBox<String> referenceCommunicationName;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogArchiKey(Frame _frame, String _title, TMLArchiKey _artifact) {
@@ -181,7 +177,7 @@ public class JDialogArchiKey extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogArrayGet.java b/src/main/java/ui/window/JDialogArrayGet.java
index bfd1aecadb49ee9db20da9f765f338236e1396a0..935befbbaea95a7e5c3d59b03904c1f859cf9ae6 100755
--- a/src/main/java/ui/window/JDialogArrayGet.java
+++ b/src/main/java/ui/window/JDialogArrayGet.java
@@ -70,10 +70,6 @@ public class JDialogArrayGet extends JDialogBase implements ActionListener {
     private JTextField variableText, arrayText, indexText;
 	private JLabel valueLabel; 
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogArrayGet(Frame f, String _variable, String _array, String _index, String title) {
         super(f, title, true);
@@ -177,7 +173,7 @@ public class JDialogArrayGet extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogArraySet.java b/src/main/java/ui/window/JDialogArraySet.java
index 4f2c9e53e7f269017b9a24be15476a3756f7480a..681fff27236471d8ec7b30a48faea9ce498cf55e 100755
--- a/src/main/java/ui/window/JDialogArraySet.java
+++ b/src/main/java/ui/window/JDialogArraySet.java
@@ -70,10 +70,6 @@ public class JDialogArraySet extends JDialogBase implements ActionListener {
     private JTextField exprText, arrayText, indexText;
 	private JLabel valueLabel; 
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogArraySet(Frame f, String _array, String _index, String _expr, String title) {
         super(f, title, true);
@@ -177,7 +173,7 @@ public class JDialogArraySet extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAssumption.java b/src/main/java/ui/window/JDialogAssumption.java
index 05f0f3e4f4242e733bbe6243ba34ba74f9fa441e..911eef39482fc94811626da96f04258656791962 100755
--- a/src/main/java/ui/window/JDialogAssumption.java
+++ b/src/main/java/ui/window/JDialogAssumption.java
@@ -65,7 +65,6 @@ public class JDialogAssumption extends JDialogBase implements ActionListener  {
     private String name;
     private int type, durability, source, status, limitation;
     private String text;
-    private JButton closeButton, cancelButton;
     
     // Panel1
     private JComboBox<String> typeBox;
@@ -213,7 +212,7 @@ public class JDialogAssumption extends JDialogBase implements ActionListener  {
         c0.gridwidth = 1;
         c0.gridheight = 1;
         
-        initButtons(closeButton, cancelButton, c0, c, this);   
+        initButtons(c0, c, this);   
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAttack.java b/src/main/java/ui/window/JDialogAttack.java
index 217c450dd6a0212a693b9a7ef1844e6087f26da6..7ea131e33fc64705c5343fb5d40e820bf72ca0cf 100755
--- a/src/main/java/ui/window/JDialogAttack.java
+++ b/src/main/java/ui/window/JDialogAttack.java
@@ -70,10 +70,6 @@ public class JDialogAttack extends JDialogBase implements ActionListener  {
 	protected JTextField name, description;
 	protected JCheckBox isRootAttack;
 	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-	
 	private ATDAttack attack;
     
     /** Creates new form  */
@@ -144,7 +140,7 @@ public class JDialogAttack extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAttribute.java b/src/main/java/ui/window/JDialogAttribute.java
index 9540f6117a3b717ed615505b438e7b10e8aa98b3..efa65052dceb3add9d2b6f597ff0aefd0ab4fd60 100755
--- a/src/main/java/ui/window/JDialogAttribute.java
+++ b/src/main/java/ui/window/JDialogAttribute.java
@@ -83,10 +83,6 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
     protected JButton downButton;
     protected JButton removeButton;
     
-    // Main Panel
-    protected JButton closeButton;
-    protected JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogAttribute(java.util.List<TAttribute> _attributes, java.util.List<TAttribute>_forbidden, Frame f, String title, String attrib) {
         super(f, title, true);
@@ -252,7 +248,7 @@ public class JDialogAttribute extends JDialogBase implements ActionListener, Lis
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarBlock.java b/src/main/java/ui/window/JDialogAvatarBlock.java
index b6400f7fc111d3421d7c08dbe0250faae12e9a3a..27c52e899d54d9119041d90b234526914c322b72 100755
--- a/src/main/java/ui/window/JDialogAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogAvatarBlock.java
@@ -64,7 +64,7 @@ import java.util.LinkedList;
  * @version 1.0 08/04/2010
  * @author Ludovic APVRILLE
  */
-public class JDialogAvatarBlock extends JDialog implements ActionListener, ListSelectionListener  {
+public class JDialogAvatarBlock extends JDialogBase implements ActionListener, ListSelectionListener  {
 
     private LinkedList<TAttribute> attributes, attributesPar, forbidden;
     private LinkedList<Boolean> initValues;
@@ -121,10 +121,6 @@ public class JDialogAvatarBlock extends JDialog implements ActionListener, ListS
     private JButton downSignalButton;
     private JButton removeSignalButton;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogAvatarBlock(LinkedList<TAttribute> _attributes, LinkedList<AvatarMethod> _methods, LinkedList<AvatarSignal> _signals, LinkedList<TAttribute> _forbidden, Frame f, String title, String attrib, int _tab, String []_globalCode, boolean _hasGlobalCode, String _mainCode) {
         super(f, title, true);
@@ -599,14 +595,7 @@ public class JDialogAvatarBlock extends JDialog implements ActionListener, ListS
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        closeButton = new JButton("Save and Close", IconManager.imgic25);
-        //closeButton.setPreferredSize(new Dimension(600, 50));
-        closeButton.addActionListener(this);
-        c.add(closeButton, c0);
-        c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-        cancelButton = new JButton("Cancel", IconManager.imgic27);
-        cancelButton.addActionListener(this);
-        c.add(cancelButton, c0);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarBlockArtifact.java b/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
index 843e4fcb0c3cf7cc353bb6d145cbf41f02aab2bf..48ad98e818144d783588beea86312574f2ed5b44 100755
--- a/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
+++ b/src/main/java/ui/window/JDialogAvatarBlockArtifact.java
@@ -72,10 +72,6 @@ public class JDialogAvatarBlockArtifact extends JDialogBase implements ActionLis
     
     //protected JTextField taskName;
 	protected JComboBox<String> referenceTaskName;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogAvatarBlockArtifact(Frame _frame, String _title, ADDBlockArtifact _artifact) {
@@ -156,7 +152,7 @@ public class JDialogAvatarBlockArtifact extends JDialogBase implements ActionLis
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarChannelArtifact.java b/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
index 6f74aa9ad5bc19a8e3da33e28321c3354f70b615..9c1f200d50749a94f6edc1acb8efa52c7d5668f1 100755
--- a/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/main/java/ui/window/JDialogAvatarChannelArtifact.java
@@ -73,10 +73,6 @@ public class JDialogAvatarChannelArtifact extends JDialogBase implements ActionL
     //protected JTextField taskName;
     protected JComboBox<String> referenceDiagram;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogAvatarChannelArtifact(Frame _frame, String _title, ADDChannelArtifact _artifact) {
         super(_frame, _title, true);
@@ -156,7 +152,7 @@ public class JDialogAvatarChannelArtifact extends JDialogBase implements ActionL
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarFirewall.java b/src/main/java/ui/window/JDialogAvatarFirewall.java
index 7776da1300818d4517417b4bceebae3aa3d30e25..7f671b87f1823a3a58434f0fb5c6209e2a8a3d04 100644
--- a/src/main/java/ui/window/JDialogAvatarFirewall.java
+++ b/src/main/java/ui/window/JDialogAvatarFirewall.java
@@ -84,8 +84,6 @@ public class JDialogAvatarFirewall extends JDialogBase implements ActionListener
     private JButton addButton,removeButton;
     
     // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     private JComboBox<String> task1;
     private JComboBox<String> task2;
     /** Creates new form  */
@@ -199,7 +197,7 @@ public class JDialogAvatarFirewall extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarLibraryFunction.java b/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
index 27c02b2fc2f3abeb22bf303b4f6732ffabbf220c..ab94df970fae5493f31aef33fb5b20abcbbd2342 100755
--- a/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
+++ b/src/main/java/ui/window/JDialogAvatarLibraryFunction.java
@@ -73,8 +73,6 @@ public class JDialogAvatarLibraryFunction extends JDialogBase implements ActionL
 
     // General
     private JTabbedPane tabbedPane;
-    private JButton closeButton;
-    private JButton cancelButton;
 
     private JButton removeButtons[];
     private JButton modifyButtons[];
@@ -570,7 +568,7 @@ public class JDialogAvatarLibraryFunction extends JDialogBase implements ActionL
         gridConstraints.gridheight = 1;
         gridConstraints.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, gridConstraints, c, this);
+        initButtons(gridConstraints, c, this);
     }
 
     public void selectTabIndex (int tab) {
diff --git a/src/main/java/ui/window/JDialogAvatarProperty.java b/src/main/java/ui/window/JDialogAvatarProperty.java
index ebe4779241c6c6b5d6162a9a09b67a925d80e233..fc1259647fab20b8d2daa3f2ff4156b1b15d54c1 100755
--- a/src/main/java/ui/window/JDialogAvatarProperty.java
+++ b/src/main/java/ui/window/JDialogAvatarProperty.java
@@ -65,10 +65,6 @@ public class JDialogAvatarProperty extends JDialogBase implements ActionListener
     private JTextField myName;
     private JRadioButton safety, notSafety, reachability, liveness, notReachability, notLiveness;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     //private String id1, id2;
 
     /** Creates new form  */
@@ -173,7 +169,7 @@ public class JDialogAvatarProperty extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarPropertyConnector.java b/src/main/java/ui/window/JDialogAvatarPropertyConnector.java
index 161e9438633e52b251ac4aaa2dcd0dfa595bb1b2..5c7ce43106370d8370c9d88a9194d9389e0a61d4 100755
--- a/src/main/java/ui/window/JDialogAvatarPropertyConnector.java
+++ b/src/main/java/ui/window/JDialogAvatarPropertyConnector.java
@@ -62,10 +62,6 @@ public class JDialogAvatarPropertyConnector extends JDialogBase implements Actio
 	private boolean hasBeenCancelled = true;
     private JCheckBox isNegated;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     //private String id1, id2;
     
     /** Creates new form  */
@@ -130,7 +126,7 @@ public class JDialogAvatarPropertyConnector extends JDialogBase implements Actio
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarSignal.java b/src/main/java/ui/window/JDialogAvatarSignal.java
index 747e403ccc3550db1c9c4251b02423f5c60519a7..c2d3821510888f8e9d848d81384e2b93d6f8c9c7 100755
--- a/src/main/java/ui/window/JDialogAvatarSignal.java
+++ b/src/main/java/ui/window/JDialogAvatarSignal.java
@@ -80,11 +80,6 @@ public class JDialogAvatarSignal extends JDialogBase implements ActionListener
     private JButton selectSignal;
     private JTextField signal;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
-
     /** Creates new form  */
     public JDialogAvatarSignal(Frame _f, String _title, String _currentSignal, LinkedList<AvatarSignal> _signals, boolean _isOut, TGComponent _reference, Vector<TGComponent> _refs) {
 
@@ -198,8 +193,8 @@ public class JDialogAvatarSignal extends JDialogBase implements ActionListener
         c0.gridwidth = 1;
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
-        
-        initButtons(closeButton, cancelButton, c0, c, this);
+
+        initButtons(c0, c, this);
     }
 
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarState.java b/src/main/java/ui/window/JDialogAvatarState.java
index f4ab694296abb58ac0fbceba735e1b75e52d9663..807e052e7a93997107d18c3a887ce9777364b196 100755
--- a/src/main/java/ui/window/JDialogAvatarState.java
+++ b/src/main/java/ui/window/JDialogAvatarState.java
@@ -57,7 +57,7 @@ import java.awt.event.ActionListener;
  * @version 1.0 08/03/2013
  * @author Ludovic APVRILLE
  */
-public class JDialogAvatarState extends JDialog implements ActionListener  {
+public class JDialogAvatarState extends JDialogBase implements ActionListener  {
     
 	
 	//protected String [] globalCode;
@@ -72,10 +72,6 @@ public class JDialogAvatarState extends JDialog implements ActionListener  {
     // Panel1
     private String stateName;
 	private JTextField stateNameText;
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
 	
 	// Panel of code and files
 	protected JTextArea jtaEntryCode; 
@@ -211,14 +207,7 @@ public class JDialogAvatarState extends JDialog implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        closeButton = new JButton("Save and Close", IconManager.imgic25);
-        //closeButton.setPreferredSize(new Dimension(600, 50));
-        closeButton.addActionListener(this);
-        c.add(closeButton, c0);
-        c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-        cancelButton = new JButton("Cancel", IconManager.imgic27);
-        cancelButton.addActionListener(this);
-        c.add(cancelButton, c0);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarTimer.java b/src/main/java/ui/window/JDialogAvatarTimer.java
index e4e777b75f990c7a05899f588642f911790c105b..845172d98b277dfb7457c85edb30ffb0082b84ec 100755
--- a/src/main/java/ui/window/JDialogAvatarTimer.java
+++ b/src/main/java/ui/window/JDialogAvatarTimer.java
@@ -72,9 +72,6 @@ public class JDialogAvatarTimer extends JDialogBase implements ActionListener  {
     private JTextField tvalue;
 
     // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     private String timer, value;
     private boolean setValue;
 
@@ -183,7 +180,7 @@ public class JDialogAvatarTimer extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogAvatarTransition.java b/src/main/java/ui/window/JDialogAvatarTransition.java
index 4aaa39d4dd13bae47dd1c95720a3e7c149bda0c5..aa3fc6e0681e5cbf82964cfa1db56fed825a5dba 100755
--- a/src/main/java/ui/window/JDialogAvatarTransition.java
+++ b/src/main/java/ui/window/JDialogAvatarTransition.java
@@ -61,7 +61,7 @@ import java.util.Vector;
    * @version 1.0 12/04/2010
    * @author Ludovic APVRILLE
  */
-public class JDialogAvatarTransition extends JDialog implements ActionListener  {
+public class JDialogAvatarTransition extends JDialogBase implements ActionListener  {
 
     private Vector<String> actions;
     private String guard, afterMin, afterMax, computeMin, computeMax;
@@ -83,10 +83,6 @@ public class JDialogAvatarTransition extends JDialog implements ActionListener
     private JComboBox<String> elements;
     private JButton insertElement;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     // Panel of code and files
     protected JTextArea jtaCode, jtaFiles;
 
@@ -297,16 +293,8 @@ public class JDialogAvatarTransition extends JDialog implements ActionListener
     	c0.gridwidth = 1;
     	c0.gridheight = 1;
     	c0.fill = GridBagConstraints.HORIZONTAL;
-    	closeButton = new JButton("Save and Close", IconManager.imgic25);
-    	//closeButton.setPreferredSize(new Dimension(600, 50));
-
-
-    	closeButton.addActionListener(this);
-    	buttons.add(closeButton, c0);
-    	c0.gridwidth = GridBagConstraints.REMAINDER; //end row
-    	cancelButton = new JButton("Cancel", IconManager.imgic27);
-    	cancelButton.addActionListener(this);
-    	buttons.add(cancelButton, c0);
+    	
+    	initButtons(c0, buttons, this);
 
     	c.add(buttons, BorderLayout.SOUTH);
     }
diff --git a/src/main/java/ui/window/JDialogBUSNode.java b/src/main/java/ui/window/JDialogBUSNode.java
index ab3471fc58717aa60194792628cdcdc5bfe5277a..ec0afcf71653ef737f02465eb33c8fd276740094 100755
--- a/src/main/java/ui/window/JDialogBUSNode.java
+++ b/src/main/java/ui/window/JDialogBUSNode.java
@@ -72,7 +72,6 @@ public class JDialogBUSNode extends JDialogBase implements ActionListener  {
     private JComboBox<String> arbitrationPolicy, privacy, refAttacks;
     protected JTextField sliceTime;
     private Vector<String> refs;
-    private JButton closeButton, cancelButton;
 
     /** Creates new form  */
     public JDialogBUSNode(Frame _frame, String _title, TMLArchiBUSNode _node, Vector<String> _refs) {
@@ -185,7 +184,7 @@ public class JDialogBUSNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogBase.java b/src/main/java/ui/window/JDialogBase.java
index 3228116cceb41a609fc4aa1c64c789dec95fa4fa..4380b4c4cff76b401f346d41674176dd9c77557a 100644
--- a/src/main/java/ui/window/JDialogBase.java
+++ b/src/main/java/ui/window/JDialogBase.java
@@ -26,6 +26,8 @@ import ui.util.IconManager;
 
 public class JDialogBase extends JDialog {
 	
+	protected JButton cancelButton, closeButton;
+	
 	protected JDialogBase(Frame _frame, String _title, boolean b) {
 		super(_frame, _title, b);
 		getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
@@ -50,7 +52,7 @@ public class JDialogBase extends JDialog {
         });
 	}
 	
-	protected void initButtons(JButton closeButton, JButton cancelButton, GridBagConstraints c0, Container c,
+	protected void initButtons(GridBagConstraints c0, Container c,
 			                  ActionListener al) {
 		//Close Button
         closeButton = new JButton("Save and Close", IconManager.imgic25);
@@ -66,6 +68,5 @@ public class JDialogBase extends JDialog {
         
         //Add closeButton's behaviour on Enter key
         this.getRootPane().setDefaultButton(closeButton);
-;
 	}
 }
diff --git a/src/main/java/ui/window/JDialogBridgeNode.java b/src/main/java/ui/window/JDialogBridgeNode.java
index 653ef1e4db5d9727de28bee9fe93c45691fe70c4..6d0b34034f20a4542249e23e7a132d6b90aae55c 100755
--- a/src/main/java/ui/window/JDialogBridgeNode.java
+++ b/src/main/java/ui/window/JDialogBridgeNode.java
@@ -75,11 +75,6 @@ public class JDialogBridgeNode extends JDialogBase implements ActionListener  {
     // Panel2
     protected JTextField bufferByteDataSize, clockRatio;
 
-
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogBridgeNode(Frame _frame, String _title, TMLArchiBridgeNode _node) {
         super(_frame, _title, true);
@@ -153,7 +148,7 @@ public class JDialogBridgeNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCAMSConnectingPoint.java b/src/main/java/ui/window/JDialogCAMSConnectingPoint.java
index 31597858a9420e1311086010c5e2f2a73d705aa7..ec5a9c91cf53fc03f3215e5c9da42d149a4ef8e2 100755
--- a/src/main/java/ui/window/JDialogCAMSConnectingPoint.java
+++ b/src/main/java/ui/window/JDialogCAMSConnectingPoint.java
@@ -77,10 +77,6 @@ public class JDialogCAMSConnectingPoint extends JDialogBase implements ActionLis
     
     // Panel2
     protected JTextField type, rate;
-
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
 	/** Creates new form  */
 	public JDialogCAMSConnectingPoint(Frame _frame, String _title, CAMSConnectingPoint _ccp) {
@@ -158,7 +154,7 @@ public class JDialogCAMSConnectingPoint extends JDialogBase implements ActionLis
 		c0.gridheight = 1;
 		c0.fill = GridBagConstraints.HORIZONTAL;
 		
-		initButtons(closeButton, cancelButton, c0, c, this);
+		initButtons(c0, c, this);
 	}
 	
 	public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCPUNode.java b/src/main/java/ui/window/JDialogCPUNode.java
index 1f424a6eaa35bc12efdf6fb36b2778ec3a085069..3fe178e5ebc9251adfb1bb36fc346a8490401ed8 100755
--- a/src/main/java/ui/window/JDialogCPUNode.java
+++ b/src/main/java/ui/window/JDialogCPUNode.java
@@ -84,9 +84,6 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener  {
     // Tabbed pane for panel1 and panel2
     private JTabbedPane tabbedPane;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     private java.util.List<SimulationTransaction> transactions;
     /** Creates new form  */
     public JDialogCPUNode(Frame _frame, String _title, TMLArchiCPUNode _node, ArchUnitMEC _MECType, java.util.List<SimulationTransaction> _transactions) {
@@ -305,7 +302,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogChannel.java b/src/main/java/ui/window/JDialogChannel.java
index 4f709d64973a444fafbfd95e71aeb26f1bacd0c0..18547bd68ca13c86011b0d61097738141cb2ab73 100755
--- a/src/main/java/ui/window/JDialogChannel.java
+++ b/src/main/java/ui/window/JDialogChannel.java
@@ -63,9 +63,7 @@ public class JDialogChannel extends JDialogBase implements ActionListener {
     private String name;
     private int type, size, max;
     
-    public boolean data;
-    private JButton closeButton, cancelButton;
-    
+    public boolean data;   
     
     // Panel1
     private JTextField nameText, sizeText, maxText;
@@ -171,7 +169,7 @@ public class JDialogChannel extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCommunicationArtifact.java b/src/main/java/ui/window/JDialogCommunicationArtifact.java
index e82ba83962eb7e601b5ba1d7df9056e77c965adb..48cae928755fb4aa0b68dac023f870888fff00c4 100755
--- a/src/main/java/ui/window/JDialogCommunicationArtifact.java
+++ b/src/main/java/ui/window/JDialogCommunicationArtifact.java
@@ -72,10 +72,6 @@ public class JDialogCommunicationArtifact extends JDialogBase implements ActionL
     private TMLArchiCommunicationArtifact artifact;
     
 	protected JComboBox<String> referenceCommunicationName, priority;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogCommunicationArtifact(Frame _frame, String _title, TMLArchiCommunicationArtifact _artifact) {
@@ -180,7 +176,7 @@ public class JDialogCommunicationArtifact extends JDialogBase implements ActionL
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogConstraint.java b/src/main/java/ui/window/JDialogConstraint.java
index b6dd043aca66318b5e1fb50dcf083ceb91cf425b..f4e8428a5dd4f7e4cd7d9b971abafd424cff3522 100755
--- a/src/main/java/ui/window/JDialogConstraint.java
+++ b/src/main/java/ui/window/JDialogConstraint.java
@@ -68,13 +68,7 @@ public class JDialogConstraint extends JDialogBase implements ActionListener  {
     
     //protected JTextField taskName;
 	protected JComboBox<String> stereotype;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
-    
-	
+
 	private ConstraintListInterface constraint;
     
     /** Creates new form  */
@@ -137,7 +131,7 @@ public class JDialogConstraint extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogConstraintText.java b/src/main/java/ui/window/JDialogConstraintText.java
index 398be3cebb466db7e57964ae45df7de879be1e20..d35d73e2d61f55a66e4c5340c622eda22f211178 100755
--- a/src/main/java/ui/window/JDialogConstraintText.java
+++ b/src/main/java/ui/window/JDialogConstraintText.java
@@ -70,13 +70,6 @@ public class JDialogConstraintText extends JDialogBase implements ActionListener
     protected JComboBox<String> stereotype;
     protected JTextField textEdition;
 
-
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
-
-
     private ConstraintListInterface constraint;
 
     /** Creates new form  */
@@ -147,7 +140,7 @@ public class JDialogConstraintText extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCountermeasure.java b/src/main/java/ui/window/JDialogCountermeasure.java
index abd03cfa6d7eb1bd2d3ed34b84bc07283035048c..041218f16beefa934a31edab95ba0a26afcd5e88 100755
--- a/src/main/java/ui/window/JDialogCountermeasure.java
+++ b/src/main/java/ui/window/JDialogCountermeasure.java
@@ -69,10 +69,6 @@ public class JDialogCountermeasure extends JDialogBase implements ActionListener
     //protected JTextField taskName;
     protected JTextField name, description;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     private ATDCountermeasure countermeasure;
 
     /** Creates new form  */
@@ -138,7 +134,7 @@ public class JDialogCountermeasure extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCrossbarNode.java b/src/main/java/ui/window/JDialogCrossbarNode.java
index 61e702680ac20ae87cd37eeac6ec50c313b6469a..ab0d6c8573b22e580f467283b0c4f40229b56ea8 100755
--- a/src/main/java/ui/window/JDialogCrossbarNode.java
+++ b/src/main/java/ui/window/JDialogCrossbarNode.java
@@ -77,11 +77,6 @@ public class JDialogCrossbarNode extends JDialogBase implements ActionListener
     protected JComboBox arbitrationPolicy, privacy;
     protected JTextField sliceTime;
 
-
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogCrossbarNode(Frame _frame, String _title, TMLArchiCrossbarNode _node) {
         super(_frame, _title, true);
@@ -188,7 +183,7 @@ public class JDialogCrossbarNode extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogCryptographicConfiguration.java b/src/main/java/ui/window/JDialogCryptographicConfiguration.java
index 13bead214a6a15ca0ac1f09e99e1e121d679d02f..200124d8492a205784e4b657ea1fbb81ee17e6ef 100644
--- a/src/main/java/ui/window/JDialogCryptographicConfiguration.java
+++ b/src/main/java/ui/window/JDialogCryptographicConfiguration.java
@@ -73,8 +73,6 @@ public class JDialogCryptographicConfiguration extends JDialogBase implements Ac
     private HashMap<Integer, JComboBox<String>> helps;
 
     // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     private String[] nonces;
     private String[] keys;
 
@@ -137,7 +135,7 @@ public class JDialogCryptographicConfiguration extends JDialogBase implements Ac
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogDMANode.java b/src/main/java/ui/window/JDialogDMANode.java
index 58df5ebcc16f48f9097a7bb09b4a19124a4dc06f..d84c8f7af85eaea24d84a4946018fb51a1b578de 100644
--- a/src/main/java/ui/window/JDialogDMANode.java
+++ b/src/main/java/ui/window/JDialogDMANode.java
@@ -73,12 +73,7 @@ public class JDialogDMANode extends JDialogBase implements ActionListener  {
     protected JTextField nodeName;
 	
 	// Panel2
-    protected JTextField byteDataSize, nbOfChannels, clockRatio;
-	
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
+    protected JTextField byteDataSize, nbOfChannels, clockRatio;  
     
     /** Creates new form  */
     public JDialogDMANode(Frame _frame, String _title, TMLArchiDMANode _node) {
@@ -160,7 +155,7 @@ public class JDialogDMANode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogERB.java b/src/main/java/ui/window/JDialogERB.java
index 50b525795433413dbc9291845a11cb264139dd0f..a2094828d8a701aec0f95af2e0e6a15dbb7f938c 100644
--- a/src/main/java/ui/window/JDialogERB.java
+++ b/src/main/java/ui/window/JDialogERB.java
@@ -71,11 +71,6 @@ public class JDialogERB extends JDialogBase implements ActionListener  {
 	// Panel
     protected JTextField evt, condition, action;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
-    
     /** Creates new form  */
     public JDialogERB(Frame _frame, EBRDDERB _erb) {
         super(_frame, "Event Reaction Block", true);
@@ -145,7 +140,7 @@ public class JDialogERB extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 	
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogESO.java b/src/main/java/ui/window/JDialogESO.java
index d5ee9557442e4a89ba4ad47c502d8bddedb7f390..60be50c2a568433c9b463c88aaedf6bd2f95aed4 100644
--- a/src/main/java/ui/window/JDialogESO.java
+++ b/src/main/java/ui/window/JDialogESO.java
@@ -72,11 +72,6 @@ public class JDialogESO extends JDialogBase implements ActionListener  {
     protected JTextField timeout, n ,m;
 	protected JComboBox<String> ids, oncePerEvent;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
-    
     /** Creates new form  */
     public JDialogESO(Frame _frame, EBRDDESO _eso) {
         super(_frame, "Event Sequence Operator", true);
@@ -170,7 +165,7 @@ public class JDialogESO extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 	
 	private void checkMode() {
diff --git a/src/main/java/ui/window/JDialogEventArtifact.java b/src/main/java/ui/window/JDialogEventArtifact.java
index ed42987deb8a676ecc37c55ceb3bbbb4cf7cb694..529b651b5f535497d2b531ceb671bc0df3396084 100755
--- a/src/main/java/ui/window/JDialogEventArtifact.java
+++ b/src/main/java/ui/window/JDialogEventArtifact.java
@@ -64,8 +64,6 @@ public class JDialogEventArtifact extends JDialogBase implements ActionListener
     
     private boolean regularClose;
 	private boolean emptyList = false;
-
-	private JButton closeButton, cancelButton;
 	
     private TMLArchiEventArtifact artifact;
     
@@ -172,7 +170,7 @@ public class JDialogEventArtifact extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogFirewallNode.java b/src/main/java/ui/window/JDialogFirewallNode.java
index 6d958d05c531ccef5736afce119c2aae60f62c80..944a09d73814ad1f91c916660c5db998f9a07537 100644
--- a/src/main/java/ui/window/JDialogFirewallNode.java
+++ b/src/main/java/ui/window/JDialogFirewallNode.java
@@ -66,7 +66,6 @@ public class JDialogFirewallNode extends JDialogBase implements ActionListener,L
     private boolean regularClose;
 
     private TMLArchiFirewallNode node;
-    private JButton cancelButton, closeButton;
     
 	
     // Panel1
@@ -187,7 +186,7 @@ public class JDialogFirewallNode extends JDialogBase implements ActionListener,L
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogHwANode.java b/src/main/java/ui/window/JDialogHwANode.java
index 35c8254f3b30ba4a5749cb80b9e81204a4c0c693..d364ec8e5688140709d8ed144b9746ed21351719 100755
--- a/src/main/java/ui/window/JDialogHwANode.java
+++ b/src/main/java/ui/window/JDialogHwANode.java
@@ -75,10 +75,6 @@ public class JDialogHwANode extends JDialogBase implements ActionListener  {
     // Panel2
     protected JTextField byteDataSize, execiTime, clockRatio;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogHwANode(Frame _frame, String _title, TMLArchiHWANode _node) {
         super(_frame, _title, true);
@@ -160,7 +156,7 @@ public class JDialogHwANode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogLinkNCNode.java b/src/main/java/ui/window/JDialogLinkNCNode.java
index 3c02a6dde9f9cf2d4229658f9912c2fe5f584325..6523956852996ae6cfd89895bb1ec75908d5f41f 100755
--- a/src/main/java/ui/window/JDialogLinkNCNode.java
+++ b/src/main/java/ui/window/JDialogLinkNCNode.java
@@ -66,10 +66,6 @@ public class JDialogLinkNCNode extends JDialogBase implements ActionListener {
 	private boolean hasParameter;
 	
 	private boolean data;
-	
-	private JButton closeButton, cancelButton;
-    
-    
     
     // Panel1
     private JTextField interfaceNameText, capacityText, parameterText;
@@ -178,7 +174,7 @@ public class JDialogLinkNCNode extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogManageListOfString.java b/src/main/java/ui/window/JDialogManageListOfString.java
index 85e582bab01f379541d7a1ed024213ddb12e38cd..c5139ab2078e2c75bbe9e5dd51230cc352c95591 100755
--- a/src/main/java/ui/window/JDialogManageListOfString.java
+++ b/src/main/java/ui/window/JDialogManageListOfString.java
@@ -77,8 +77,6 @@ public class JDialogManageListOfString extends JDialogBase implements ActionList
     private JButton allIgnored;
 
     // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
 
     private boolean hasBeenCancelled = true;
 
diff --git a/src/main/java/ui/window/JDialogMemoryNode.java b/src/main/java/ui/window/JDialogMemoryNode.java
index 990995e83c8bdc60de0f84b00245c71dcf76e576..f27d1510664ed9b179acba7cc9245888dbdf8c37 100755
--- a/src/main/java/ui/window/JDialogMemoryNode.java
+++ b/src/main/java/ui/window/JDialogMemoryNode.java
@@ -88,10 +88,6 @@ public class JDialogMemoryNode extends JDialogBase implements ActionListener  {
 
     private JTabbedPane tabbedPane;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogMemoryNode( Frame _frame, String _title, TMLArchiMemoryNode _node, int _bufferType ) {
         super(_frame, _title, true);
@@ -204,7 +200,7 @@ public class JDialogMemoryNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogModelChecking.java b/src/main/java/ui/window/JDialogModelChecking.java
index c69ef84bde3e1bb3b31fdea8b2846db257d9b492..aaf1595a5588d71e03c276c4053bb8032ecb2de9 100755
--- a/src/main/java/ui/window/JDialogModelChecking.java
+++ b/src/main/java/ui/window/JDialogModelChecking.java
@@ -77,10 +77,6 @@ public class JDialogModelChecking extends JDialogBase implements ActionListener,
     private JButton allIgnored;
     protected JCheckBox syntax;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogModelChecking(Frame f, LinkedList<TClassInterface> _back, java.util.List<TGComponent> componentList, String title) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogMultiString.java b/src/main/java/ui/window/JDialogMultiString.java
index fd5d54d6c13a5e842b8a6ed7820fae5a244b5cab..5b15a85594fec594c72fac5a5fd62c4de2900458 100755
--- a/src/main/java/ui/window/JDialogMultiString.java
+++ b/src/main/java/ui/window/JDialogMultiString.java
@@ -73,10 +73,6 @@ public class JDialogMultiString extends JDialogBase implements ActionListener  {
     private JButton inserts[];
     private HashMap<Integer, JComboBox<String>> helps;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     private ArrayList<String[]> possibleValues = null;
 
 
@@ -195,7 +191,7 @@ public class JDialogMultiString extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogMultiStringCP.java b/src/main/java/ui/window/JDialogMultiStringCP.java
index 737c4e40ecee5e633ab0e2e9e13a1c2262d94d8c..b65c0f225720f6edb54f45ee5e280626da557e77 100755
--- a/src/main/java/ui/window/JDialogMultiStringCP.java
+++ b/src/main/java/ui/window/JDialogMultiStringCP.java
@@ -69,11 +69,6 @@ public class JDialogMultiStringCP extends JDialogBase implements ActionListener
     // Panel1
     private JTextField [] texts;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
-    
     /** Creates new form  */
     // arrayDelay: [0] -> minDelay ; [1] -> maxDelay
     public JDialogMultiStringCP(Frame f, String title, int _nbString, String[] _labels, String[] _values) {
@@ -153,7 +148,7 @@ public class JDialogMultiStringCP extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogNCEqNode.java b/src/main/java/ui/window/JDialogNCEqNode.java
index b7490d0def572a7e656fed9dfabbe237495a6181..6576b461566fd55d35b9d951fb3ab4aa0a47227f 100755
--- a/src/main/java/ui/window/JDialogNCEqNode.java
+++ b/src/main/java/ui/window/JDialogNCEqNode.java
@@ -63,8 +63,6 @@ public class JDialogNCEqNode extends JDialogBase implements ActionListener {
 	private int type;
 	
 	private boolean data;
-	private JButton closeButton, cancelButton;
-    
     
     // Panel1
     private JTextField eqNameText;
@@ -155,7 +153,7 @@ public class JDialogNCEqNode extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogNCRoute.java b/src/main/java/ui/window/JDialogNCRoute.java
index 5345433b5977ce42621040d17fb03d2becc646e5..abea3c8950400b26f32276ea2a7302bb1a4976cf 100755
--- a/src/main/java/ui/window/JDialogNCRoute.java
+++ b/src/main/java/ui/window/JDialogNCRoute.java
@@ -66,7 +66,6 @@ public class JDialogNCRoute extends JDialogBase implements ActionListener, ListS
 	private ArrayList<String> inputInterfaces, traffics, outputInterfaces;
 
 	protected String value;
-	protected JButton closeButton, cancelButton;
 	
 	protected boolean hasBeenCancelled = true;
     
@@ -274,7 +273,7 @@ public class JDialogNCRoute extends JDialogBase implements ActionListener, ListS
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogNCSwitchNode.java b/src/main/java/ui/window/JDialogNCSwitchNode.java
index 28b43d85929fdc5a3f7b7bf0ac1dc3377d6699ac..dfc953f01b2ad167ddfaa8c84f06a48b8245eaa1 100755
--- a/src/main/java/ui/window/JDialogNCSwitchNode.java
+++ b/src/main/java/ui/window/JDialogNCSwitchNode.java
@@ -66,7 +66,6 @@ public class JDialogNCSwitchNode extends JDialogBase implements ActionListener {
 	private int technicalLatency;
 	
 	private boolean data;
-	private JButton cancelButton, closeButton;
     
     
     // Panel1
@@ -186,7 +185,7 @@ public class JDialogNCSwitchNode extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogNCTraffic.java b/src/main/java/ui/window/JDialogNCTraffic.java
index 2395f87b2ad4cccbe579c8c6157b0e93a252e5ee..238f7c9c23e71c5cb3b2aeeb3a39359969b64b40 100755
--- a/src/main/java/ui/window/JDialogNCTraffic.java
+++ b/src/main/java/ui/window/JDialogNCTraffic.java
@@ -62,7 +62,6 @@ public class JDialogNCTraffic extends JDialogBase implements ActionListener {
     private int periodicType, period, deadline, minPacketSize, maxPacketSize, priority;
 	
 	private boolean data;
-	private JButton cancelButton, closeButton;
     
     // Panel1
     private JTextField valueText, periodText, deadlineText, minPacketSizeText, maxPacketSizeText;
@@ -214,7 +213,7 @@ public class JDialogNCTraffic extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogObserver.java b/src/main/java/ui/window/JDialogObserver.java
index 59c419bb7c8ae803ed3dafa04ebfb46f0fdbd90f..018bc9a387b47820f0d7ce0d57cc4963c357e45e 100755
--- a/src/main/java/ui/window/JDialogObserver.java
+++ b/src/main/java/ui/window/JDialogObserver.java
@@ -68,12 +68,6 @@ public class JDialogObserver extends JDialogBase implements ActionListener  {
     // Panel1
     protected JTextField diagramBox;
     private JTextField violatedActionBox;
-	
-    //Panel2
-    
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogObserver(Frame _frame, String _title, String _diagram, String _violatedAction) {
@@ -150,7 +144,7 @@ public class JDialogObserver extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogParam.java b/src/main/java/ui/window/JDialogParam.java
index 014f754743385f641b15f4c81f6df7830e5dd758..1dc9f97314ba831843cfc9adf3e4d8bdf4b6754b 100755
--- a/src/main/java/ui/window/JDialogParam.java
+++ b/src/main/java/ui/window/JDialogParam.java
@@ -64,7 +64,6 @@ public class JDialogParam extends JDialogBase implements ActionListener {
     private int type1, type2, type3;
     
     public boolean data;
-    private JButton closeButton, cancelButton;
     
     
     // Panel1
@@ -176,7 +175,7 @@ public class JDialogParam extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogParamFIFO.java b/src/main/java/ui/window/JDialogParamFIFO.java
index cb1f08de9d0590d6d9b4bca2bf374b1585d1ab0d..dfaff12da2b2b9102d90e2faf9438a1aa02dc6ec 100755
--- a/src/main/java/ui/window/JDialogParamFIFO.java
+++ b/src/main/java/ui/window/JDialogParamFIFO.java
@@ -66,7 +66,6 @@ public class JDialogParamFIFO extends JDialogBase implements ActionListener {
     private String maxInFIFO;
 
     public boolean data;
-    private JButton closeButton, cancelButton;
 
     
     
@@ -226,7 +225,7 @@ public class JDialogParamFIFO extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogPortArtifact.java b/src/main/java/ui/window/JDialogPortArtifact.java
index 1479e3daf6d11c880b542315f858395c26d033dd..cc934a31304f9e2f5a2b98e84a82325d9258d748 100755
--- a/src/main/java/ui/window/JDialogPortArtifact.java
+++ b/src/main/java/ui/window/JDialogPortArtifact.java
@@ -105,10 +105,6 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
 	//Mapper LUT
 	protected JTextField baseAddressLUTMapp_TF;
 	protected String baseAddressLUTMapp;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
 
 	//Code generation
 	private JPanel panel3;//, panel4, panel5;
@@ -216,7 +212,7 @@ public class JDialogPortArtifact extends JDialogBase implements ActionListener
 		c0.gridheight = 1;
 		c0.fill = GridBagConstraints.HORIZONTAL;
 		
-		initButtons(closeButton, cancelButton, c0, c, this);
+		initButtons(c0, c, this);
   }
 
 	private String getBufferTypeFromSelectedMemory( String mappedMemory )	{
diff --git a/src/main/java/ui/window/JDialogReducedAttribute.java b/src/main/java/ui/window/JDialogReducedAttribute.java
index 4b443a6fe580633e5ad1fe7c0264e7f90168fba9..1147cfeb9e9feee4f8178e3ec87b68d1d9492532 100755
--- a/src/main/java/ui/window/JDialogReducedAttribute.java
+++ b/src/main/java/ui/window/JDialogReducedAttribute.java
@@ -80,10 +80,6 @@ public class JDialogReducedAttribute extends JDialogBase implements ActionListen
     private JList<TAttribute> setAttributes;
     private JButton unsetButton;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogReducedAttribute(java.util.List<TAttribute> _attributes, java.util.List<TAttribute> _tclassAttributes, Frame f, String title, String  _attrib, String _nameTObject, String _nameTClass) {
         super(f, title, true);
@@ -238,7 +234,7 @@ public class JDialogReducedAttribute extends JDialogBase implements ActionListen
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogRequirement.java b/src/main/java/ui/window/JDialogRequirement.java
index 958a74e2658708cb13a90f352bd2f5273e94c562..8501fc651cec0de3be43b5e4f2409aa5dcb4604a 100755
--- a/src/main/java/ui/window/JDialogRequirement.java
+++ b/src/main/java/ui/window/JDialogRequirement.java
@@ -84,10 +84,6 @@ public class JDialogRequirement extends JDialogBase implements ActionListener  {
     private JComboBox<String> kindBox, criticalityBox;
     private JTextField idBox, violatedActionBox, attackTreeNodeBox, referenceElementsBox;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogRequirement(Frame _frame, String _title, String _id, String _text, String _kind, String _criticality, String _violatedAction, int _type, String _attackTreeNode, String _referenceElements) {
         super(_frame, _title, true);
@@ -295,7 +291,7 @@ public class JDialogRequirement extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogRequirementTable.java b/src/main/java/ui/window/JDialogRequirementTable.java
index 3de48989926c8e16c94c444ae58eb10bdaa16607..feff78d5021e4e8c0a5a36997564d757ba5c8c28 100755
--- a/src/main/java/ui/window/JDialogRequirementTable.java
+++ b/src/main/java/ui/window/JDialogRequirementTable.java
@@ -65,7 +65,6 @@ public class JDialogRequirementTable extends JDialogBase implements ActionListen
 	private int nbColumn = 10;
     private static int[] selectedItems = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
 	private static int[] selectedSizes = {1, 3, 2, 6, 2, 2, 2, 2, 1, 2};
-	private JButton cancelButton, closeButton;
 	
     // Panel1
     private ArrayList<JComboBox<String>> itemBoxes, sizeBoxes;
@@ -144,7 +143,7 @@ public class JDialogRequirementTable extends JDialogBase implements ActionListen
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogSDInstance.java b/src/main/java/ui/window/JDialogSDInstance.java
index 6234e56e31ca6e73dab0642d42815838b3c99473..7c5e4a2e96e3ca56b283c8990bd0436981812c11 100644
--- a/src/main/java/ui/window/JDialogSDInstance.java
+++ b/src/main/java/ui/window/JDialogSDInstance.java
@@ -70,10 +70,6 @@ public class JDialogSDInstance extends JDialogBase implements ActionListener {
     private JTextField instanceName;
 	private JCheckBox actor;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogSDInstance(Frame f, String _name, boolean _isActor, String _title) {
         super(f, _title, true);
@@ -146,7 +142,7 @@ public class JDialogSDInstance extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java b/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
index 560b69940fb86a7b22539f923707aea9ac03f0d3..60bba17bf444ebc9a491e5e26377ecc37c5d1379 100644
--- a/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
+++ b/src/main/java/ui/window/JDialogSMDLibraryFunctionCall.java
@@ -71,8 +71,6 @@ public class JDialogSMDLibraryFunctionCall extends JDialogBase implements Action
     private AvatarSignal[] signals;
     private TAttribute[] returnAttributes;
 
-    private JButton closeButton, cancelButton;
-
     private static class FunctionWrapper {
         AvatarBDLibraryFunction inner;
 
@@ -315,7 +313,7 @@ public class JDialogSMDLibraryFunctionCall extends JDialogBase implements Action
         gridConstraints.weighty = 1.0;
         gridConstraints.fill = GridBagConstraints.BOTH;
         
-        initButtons(closeButton, cancelButton, gridConstraints, c, this);
+        initButtons(gridConstraints, c, this);
     }
 
     private void fillParametersComboBox (TAttribute attr) {
diff --git a/src/main/java/ui/window/JDialogSelectAvatarBlock.java b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
index 1fde123ab3ef021f26e8f99d5c45a8f4144c67a4..03e65caa0c61fa05e45db739feec837cc3b3c485 100755
--- a/src/main/java/ui/window/JDialogSelectAvatarBlock.java
+++ b/src/main/java/ui/window/JDialogSelectAvatarBlock.java
@@ -75,9 +75,6 @@ public class JDialogSelectAvatarBlock extends JDialogBase implements ActionListe
     private JButton allIgnored;
     protected JCheckBox optimize;
 
-    // Main Panel
-    private JButton closeButton;
-
     private boolean hasBeenCancelled = true;
 
     /** Creates new form  */
diff --git a/src/main/java/ui/window/JDialogSelectCPDiagrams.java b/src/main/java/ui/window/JDialogSelectCPDiagrams.java
index 31aeebe087fe7a8f47da59c5981398140d064d91..9c34d9f27926d5d105bd3aa9074cd68167585fe5 100755
--- a/src/main/java/ui/window/JDialogSelectCPDiagrams.java
+++ b/src/main/java/ui/window/JDialogSelectCPDiagrams.java
@@ -84,10 +84,6 @@ public class JDialogSelectCPDiagrams extends JDialogBase implements ActionListen
     protected JCheckBox optimize;
     //  protected JTextField clockField;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogSelectCPDiagrams( Frame f, Vector<TGComponent> _back, List<TGComponent> componentList, String title ) {
 
diff --git a/src/main/java/ui/window/JDialogSelectRequirements.java b/src/main/java/ui/window/JDialogSelectRequirements.java
index e178e22eac99b44c12fc7e62efb132be0fb4ce3f..f811284b4e431384051f04c960fb4974bcdfdf61 100755
--- a/src/main/java/ui/window/JDialogSelectRequirements.java
+++ b/src/main/java/ui/window/JDialogSelectRequirements.java
@@ -76,10 +76,6 @@ public class JDialogSelectRequirements extends JDialogBase implements ActionList
     private JButton addOneIgnored;
     private JButton allIgnored;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogSelectRequirements(Frame f, Vector<Requirement> _back, java.util.List<TGComponent> componentList, String title) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java b/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
index 0d15fbf0489a5ebdb6d9dc4ccdf3664e59655178..6601f4b62bd1f2f0d9431d31d7a1cdca126fc0dc 100755
--- a/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
+++ b/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
@@ -83,10 +83,6 @@ public class JDialogSelectSystemCAMSBlock extends JDialogBase implements ActionL
     protected JCheckBox optimize;
     //  protected JTextField clockField;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /* Creates new form  */
     public JDialogSelectSystemCAMSBlock( Frame f, Vector<TGComponent> _back, List<TGComponent> componentList, String title ) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogSelectTMLComponent.java b/src/main/java/ui/window/JDialogSelectTMLComponent.java
index b721fe76dcc0bdfd1e9951cf85fe8d6cc4e3827f..d3c5252b81ecb1d1a44059d3c0e63c798d48dd04 100755
--- a/src/main/java/ui/window/JDialogSelectTMLComponent.java
+++ b/src/main/java/ui/window/JDialogSelectTMLComponent.java
@@ -82,10 +82,6 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
     private JButton allIgnored;
     protected JCheckBox optimize;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogSelectTMLComponent(Frame f, Vector<TGComponent> _back, List<TGComponent> componentList, String title) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogSelectTMLNodes.java b/src/main/java/ui/window/JDialogSelectTMLNodes.java
index c0973a77162589cf8c5a38d17a99f179d881169e..30da97e51497df29f46261d04b1a344e4eff952c 100755
--- a/src/main/java/ui/window/JDialogSelectTMLNodes.java
+++ b/src/main/java/ui/window/JDialogSelectTMLNodes.java
@@ -80,10 +80,6 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
     protected JCheckBox optimize;
     protected JTextField clockField;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogSelectTMLNodes(Frame f, Vector<TGComponent> _back, java.util.List<TGComponent> componentList, String title, int _clock) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogSelectTMLTask.java b/src/main/java/ui/window/JDialogSelectTMLTask.java
index ed8f631d90b08bd458dcfb3b9e084f59c867cb81..df0b92f579b804e8ffe851a4596cafa411069ba6 100755
--- a/src/main/java/ui/window/JDialogSelectTMLTask.java
+++ b/src/main/java/ui/window/JDialogSelectTMLTask.java
@@ -77,10 +77,6 @@ public class JDialogSelectTMLTask extends JDialogBase implements ActionListener,
     private JButton allIgnored;
 	protected JCheckBox optimize;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogSelectTMLTask(Frame f, Vector<TGComponent> _back, java.util.List<TGComponent> componentList, String title) {
         super(f, title, true);
diff --git a/src/main/java/ui/window/JDialogSignalAssociation.java b/src/main/java/ui/window/JDialogSignalAssociation.java
index eacbb7d6ca78bce1e93c8b13aeba0c3fa4c9d3b9..5572eae4ba75d7431b17a3e953ca563c4d05e1aa 100644
--- a/src/main/java/ui/window/JDialogSignalAssociation.java
+++ b/src/main/java/ui/window/JDialogSignalAssociation.java
@@ -88,9 +88,6 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
     private JButton downButton;
     private JButton removeButton;
 
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
 
     /** Creates new form  */
     public JDialogSignalAssociation(Frame _f, AvatarBDBlock _block1, AvatarBDBlock _block2, Vector<String> _signalAssociation, AvatarBDPortConnector _connector, String _title) {
@@ -307,7 +304,7 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.VERTICAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
 
         /*JPanel panelButton = new JPanel();
           closeButton = new JButton("Save and Close", IconManager.imgic25);
@@ -336,11 +333,11 @@ public class JDialogSignalAssociation extends JDialogBase implements ActionListe
         //String command = evt.getActionCommand();
 
         // Compare the action command to the known actions.
-        if (evt.getSource() == closeButton)  {
+        if (evt.getActionCommand().equals("Save and Close"))  {
             closeDialog();
         } else if (evt.getSource() == addButton) {
             addSignals();
-        } else if (evt.getSource() == cancelButton) {
+        } else if (evt.getActionCommand().equals("Cancel")) {
             cancelDialog();
         } else if (evt.getSource() == removeButton) {
             removeSignals();
diff --git a/src/main/java/ui/window/JDialogSynchro.java b/src/main/java/ui/window/JDialogSynchro.java
index e13583a4f29faaeabb72ba48be61cbc6655b82aa..13b582464a1568a968e1bbc70a82932717431358 100755
--- a/src/main/java/ui/window/JDialogSynchro.java
+++ b/src/main/java/ui/window/JDialogSynchro.java
@@ -81,10 +81,6 @@ public class JDialogSynchro extends JDialogBase implements ActionListener, ListS
     private JButton downButton;
     private JButton removeButton;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     /** Creates new form  */
     public JDialogSynchro(Frame f, TClassSynchroInterface _t1, TClassSynchroInterface _t2, java.util.List<TTwoAttributes> _synchro, TCDSynchroGateList _tcdsgl, String title) {
         super(f, title, true);
@@ -271,7 +267,7 @@ public class JDialogSynchro extends JDialogBase implements ActionListener, ListS
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTMLADRandom.java b/src/main/java/ui/window/JDialogTMLADRandom.java
index cc5163ff26297f6cbd081cff9d3e0f020a99e416..495704b977624a1676b9618f6e1e02d0f3abe926 100755
--- a/src/main/java/ui/window/JDialogTMLADRandom.java
+++ b/src/main/java/ui/window/JDialogTMLADRandom.java
@@ -72,10 +72,6 @@ public class JDialogTMLADRandom extends JDialogBase implements ActionListener  {
 	// Panel2
     private JTextField jvariable, jminValue, jmaxValue;
 	private JComboBox<String> randomFunction;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogTMLADRandom(Frame _frame, String _title, String _variable, String _minValue, String _maxValue, int _functionId) {
@@ -161,7 +157,7 @@ public class JDialogTMLADRandom extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTMLCompositePort.java b/src/main/java/ui/window/JDialogTMLCompositePort.java
index c811cce18b134e7175ea2ff2d26be2414f7c1e77..92a2beedb4365b704174d43420820b7e5f6855e4 100755
--- a/src/main/java/ui/window/JDialogTMLCompositePort.java
+++ b/src/main/java/ui/window/JDialogTMLCompositePort.java
@@ -79,7 +79,6 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
     public boolean data;
     public boolean checkConf;
     public boolean checkAuth;
-    private JButton closeButton, cancelButton;
     // Panel1
     private JTextField nameText, maxText, widthText, associatedEventJT;
     private JComboBox<String> typePort, typeList1, typeList2, typeList3, typeList4, typeList5;
@@ -560,7 +559,7 @@ public class JDialogTMLCompositePort extends JDialogBase implements ActionListen
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
 		repaint();
     }
     
diff --git a/src/main/java/ui/window/JDialogTMLConnectorNode.java b/src/main/java/ui/window/JDialogTMLConnectorNode.java
index 6ac040655d95a865669b8a82c4a2f010815214a0..9dde20b8b998791ae824999ba9ce1b0495a9388a 100755
--- a/src/main/java/ui/window/JDialogTMLConnectorNode.java
+++ b/src/main/java/ui/window/JDialogTMLConnectorNode.java
@@ -70,10 +70,6 @@ public class JDialogTMLConnectorNode extends JDialogBase implements ActionListen
     
     //protected JTextField taskName;
 	protected JComboBox<String> priority;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogTMLConnectorNode(Frame _frame, String _title, TMLArchiConnectorNode _connector) {
@@ -146,7 +142,7 @@ public class JDialogTMLConnectorNode extends JDialogBase implements ActionListen
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java b/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
index 648cebe7099a96bfdb956fa5d37d927c56b4b220..5cba4059407610d068023557ef1374a37d30562b 100755
--- a/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
+++ b/src/main/java/ui/window/JDialogTMLRemoteCompositeComponent.java
@@ -67,7 +67,6 @@ public class JDialogTMLRemoteCompositeComponent extends JDialogBase implements A
     private TMLCRemoteCompositeComponent artifact;
     
 	private JComboBox<String> referenceComponentName;
-	private JButton closeButton, cancelButton;
 
     /** Creates new form  */
     public JDialogTMLRemoteCompositeComponent(Frame _frame, String _title, TMLCRemoteCompositeComponent _artifact) {
@@ -150,7 +149,7 @@ public class JDialogTMLRemoteCompositeComponent extends JDialogBase implements A
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTMLTaskArtifact.java b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
index a343191dcd580ace07481cf05b4f2a0c90bb1851..f8dbcaea81286318120f3c5aa5b9632d68c5ca96 100755
--- a/src/main/java/ui/window/JDialogTMLTaskArtifact.java
+++ b/src/main/java/ui/window/JDialogTMLTaskArtifact.java
@@ -78,10 +78,6 @@ public class JDialogTMLTaskArtifact extends JDialogBase implements ActionListene
 	protected JComboBox<String> referenceTaskName, priority, operationsListCB;
 	
 	private JTabbedPane tabbedPane;
-	
-    // Main Panel
-  private JButton closeButton;
-  private JButton cancelButton;
     
     /** Creates new form  */
   public JDialogTMLTaskArtifact(Frame _frame, String _title, TMLArchiArtifact _artifact, String _operation, ArchUnitMEC _MECType) {
@@ -224,7 +220,7 @@ public class JDialogTMLTaskArtifact extends JDialogBase implements ActionListene
     	c0.gridheight = 1;
     	c0.fill = GridBagConstraints.HORIZONTAL;
     	
-    	initButtons(closeButton, cancelButton, c0, c, this);
+    	initButtons(c0, c, this);
     }
     
     @Override
diff --git a/src/main/java/ui/window/JDialogTObjectName.java b/src/main/java/ui/window/JDialogTObjectName.java
index f00d19eebd4152043caa153d2c3c8550a8951611..0cb3a767f652c501caf3a688b31ba86387d8b2bd 100755
--- a/src/main/java/ui/window/JDialogTObjectName.java
+++ b/src/main/java/ui/window/JDialogTObjectName.java
@@ -68,10 +68,6 @@ public class JDialogTObjectName extends JDialogBase implements ActionListener {
 	// Panel1
 	private JTextField identifierText;
     private JComboBox<TCDTClass> tclassList;
-
-	// Main Panel
-	private JButton closeButton;
-	private JButton cancelButton;
 	
     /** Creates new form  */
     public JDialogTObjectName(TCDTObject _to, Frame f, String title) {
@@ -167,7 +163,7 @@ public class JDialogTObjectName extends JDialogBase implements ActionListener {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
  
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTimeInterval.java b/src/main/java/ui/window/JDialogTimeInterval.java
index 9aeb72ced1ab94eda45c430b40921f455e9f30a1..d6cb55fc392e07becc340def307e2a52c5d8071d 100755
--- a/src/main/java/ui/window/JDialogTimeInterval.java
+++ b/src/main/java/ui/window/JDialogTimeInterval.java
@@ -64,10 +64,6 @@ public class JDialogTimeInterval extends JDialogBase implements ActionListener
     // Panel1
     private JTextField text1, text2;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     private String id1, id2;
     
     /** Creates new form  */
@@ -167,7 +163,7 @@ public class JDialogTimeInterval extends JDialogBase implements ActionListener
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTimeIntervalUnit.java b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
index b604d373a5918a9e7a7acf2296636fe8cd7223f7..0cd50034ad81fd7cc125faa1a967d099ffb90bee 100755
--- a/src/main/java/ui/window/JDialogTimeIntervalUnit.java
+++ b/src/main/java/ui/window/JDialogTimeIntervalUnit.java
@@ -66,10 +66,6 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
     private JTextField text1, text2;
 	private JComboBox<String> unit;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     private String id1, id2;
     
     /** Creates new form  */
@@ -184,7 +180,7 @@ public class JDialogTimeIntervalUnit extends JDialogBase implements ActionListen
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogTwoString.java b/src/main/java/ui/window/JDialogTwoString.java
index c059ec4f935791ea1aa776bd4289018e9799ea8c..8ab9351be08ef909d2dee178f5419c8a4683a994 100755
--- a/src/main/java/ui/window/JDialogTwoString.java
+++ b/src/main/java/ui/window/JDialogTwoString.java
@@ -67,10 +67,6 @@ public class JDialogTwoString extends JDialogBase implements ActionListener  {
     // Panel1
     private JTextField text1, text2;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     
     /** Creates new form  */
     // arrayDelay: [0] -> minDelay ; [1] -> maxDelay
@@ -154,7 +150,7 @@ public class JDialogTwoString extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogUseCase.java b/src/main/java/ui/window/JDialogUseCase.java
index 85b5458e57db80f885b6820cec691855a0020c8d..c6e2f6d0d9aa9cf02ab3e933271eb267911374a1 100755
--- a/src/main/java/ui/window/JDialogUseCase.java
+++ b/src/main/java/ui/window/JDialogUseCase.java
@@ -70,10 +70,6 @@ public class JDialogUseCase extends JDialogBase implements ActionListener  {
 	
     // Panel1
     protected JTextField jname, jextension;
-	
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
     
     /** Creates new form  */
     public JDialogUseCase(Frame _frame, String _title, String _name, String _extension) {
@@ -147,7 +143,7 @@ public class JDialogUseCase extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogVGMNNode.java b/src/main/java/ui/window/JDialogVGMNNode.java
index 52c88f5efc04fe06634f9b5d6ec03ba9c945ef20..933e6625050b2277d68da2607fab1bf7b0bdbd11 100755
--- a/src/main/java/ui/window/JDialogVGMNNode.java
+++ b/src/main/java/ui/window/JDialogVGMNNode.java
@@ -77,11 +77,6 @@ public class JDialogVGMNNode extends JDialogBase implements ActionListener  {
     protected JComboBox arbitrationPolicy, privacy;
     protected JTextField sliceTime;
 
-
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-
     /** Creates new form  */
     public JDialogVGMNNode(Frame _frame, String _title, TMLArchiVGMNNode _node) {
         super(_frame, _title, true);
@@ -188,7 +183,7 @@ public class JDialogVGMNNode extends JDialogBase implements ActionListener  {
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
 
     public void actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JDialogVersioningConnector.java b/src/main/java/ui/window/JDialogVersioningConnector.java
index f88582422c693274aa16bd15204e512c27a3678e..9bddcc7966157d33afb549ebc1d1c07a48a954f3 100755
--- a/src/main/java/ui/window/JDialogVersioningConnector.java
+++ b/src/main/java/ui/window/JDialogVersioningConnector.java
@@ -64,10 +64,6 @@ public class JDialogVersioningConnector extends JDialogBase implements ActionLis
     int oldVersion, newVersion;
     private JTextField version1, version2;
     
-    // Main Panel
-    private JButton closeButton;
-    private JButton cancelButton;
-    
     boolean cancel = false;
     
     //private String id1, id2;
@@ -159,7 +155,7 @@ public class JDialogVersioningConnector extends JDialogBase implements ActionLis
         c0.gridheight = 1;
         c0.fill = GridBagConstraints.HORIZONTAL;
         
-        initButtons(closeButton, cancelButton, c0, c, this);
+        initButtons(c0, c, this);
     }
     
     public void	actionPerformed(ActionEvent evt)  {
diff --git a/src/main/java/ui/window/JFrameMinimize.java b/src/main/java/ui/window/JFrameMinimize.java
index 9eeda60a0663c1c322b6d1c39d555c0c2d4542f6..f2e4bb9029d65a985e1b8c1402f788424b229036 100755
--- a/src/main/java/ui/window/JFrameMinimize.java
+++ b/src/main/java/ui/window/JFrameMinimize.java
@@ -152,7 +152,7 @@ public class JFrameMinimize extends javax.swing.JFrame implements ActionListener
         listIgnored.addListSelectionListener(this);
         JScrollPane scrollPane1 = new JScrollPane(listIgnored);
         panel1.add(scrollPane1, BorderLayout.CENTER);
-        panel1.setPreferredSize(new Dimension(400, 250));
+        panel1.setPreferredSize(new Dimension(300, 250));
         panelTop.add(panel1, BorderLayout.WEST);
         
         // validated list
@@ -165,7 +165,7 @@ public class JFrameMinimize extends javax.swing.JFrame implements ActionListener
         listProjected.addListSelectionListener(this);
         JScrollPane scrollPane2 = new JScrollPane(listProjected);
         panel2.add(scrollPane2, BorderLayout.CENTER);
-        panel2.setPreferredSize(new Dimension(400, 250));
+        panel2.setPreferredSize(new Dimension(300, 250));
         panelTop.add(panel2, BorderLayout.EAST);
         
         // radio buttons