diff --git a/modeling/SoCLib/rover.xml b/modeling/SoCLib/rover.xml
index ed22273f58bc4a2e341387ab0c9267d91d8d3a4e..75398fd427d415edd5b7e41f17d95d253f903534 100644
--- a/modeling/SoCLib/rover.xml
+++ b/modeling/SoCLib/rover.xml
@@ -774,144 +774,207 @@
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="DistanceSensor" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="1030" id="147" >
+<COMPONENT type="1001" id="146" >
+<cdparam x="482" y="294" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="145" />
+</COMPONENT>
+
+<COMPONENT type="1012" id="154" >
+<cdparam x="397" y="109" />
+<sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="choice" value="null" />
+<TGConnectingPoint num="0" id="150" />
+<TGConnectingPoint num="1" id="151" />
+<TGConnectingPoint num="2" id="152" />
+<TGConnectingPoint num="3" id="153" />
+</COMPONENT>
+<SUBCOMPONENT type="-1" id="147" >
+<father id="154" num="0" />
+<cdparam x="372" y="119" />
+<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="148" >
+<father id="154" num="1" />
+<cdparam x="432" y="119" />
+<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="149" >
+<father id="154" num="2" />
+<cdparam x="417" y="154" />
+<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="1030" id="157" >
 <cdparam x="282" y="69" />
 <sizeparam width="92" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="for ever loop" value="Loop for ever" />
-<TGConnectingPoint num="0" id="145" />
-<TGConnectingPoint num="1" id="146" />
+<TGConnectingPoint num="0" id="155" />
+<TGConnectingPoint num="1" id="156" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="149" >
-<cdparam x="408" y="413" />
+<COMPONENT type="1001" id="159" >
+<cdparam x="324" y="292" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="148" />
+<TGConnectingPoint num="0" id="158" />
 </COMPONENT>
 
-<COMPONENT type="1013" id="153" >
-<cdparam x="413" y="184" />
+<COMPONENT type="1013" id="163" >
+<cdparam x="486" y="235" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="151" />
-<TGConnectingPoint num="1" id="152" />
+<TGConnectingPoint num="0" id="161" />
+<TGConnectingPoint num="1" id="162" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="150" >
-<father id="153" num="0" />
-<cdparam x="428" y="204" />
+<SUBCOMPONENT type="-1" id="160" >
+<father id="163" num="0" />
+<cdparam x="501" y="255" />
 <sizeparam width="85" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="samplingRate" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1006" id="156" >
-<cdparam x="358" y="147" />
+<COMPONENT type="1006" id="166" >
+<cdparam x="431" y="168" />
 <sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="ultrasonicData(1)" />
-<TGConnectingPoint num="0" id="154" />
-<TGConnectingPoint num="1" id="155" />
+<TGConnectingPoint num="0" id="164" />
+<TGConnectingPoint num="1" id="165" />
+<latencyCheck />
 <extraparam>
 <Data channelName="ultrasonicData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="159" >
-<cdparam x="360" y="352" />
+<COMPONENT type="1009" id="169" >
+<cdparam x="276" y="231" />
 <sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="samplingRate(1) " />
-<TGConnectingPoint num="0" id="157" />
-<TGConnectingPoint num="1" id="158" />
+<TGConnectingPoint num="0" id="167" />
+<TGConnectingPoint num="1" id="168" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1010" id="162" >
-<cdparam x="368" y="288" />
+<COMPONENT type="1010" id="172" >
+<cdparam x="284" y="167" />
 <sizeparam width="100" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="wait event" value="changeRate() " />
-<TGConnectingPoint num="0" id="160" />
-<TGConnectingPoint num="1" id="161" />
+<TGConnectingPoint num="0" id="170" />
+<TGConnectingPoint num="1" id="171" />
+<latencyCheck />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="164" >
+<COMPONENT type="1000" id="174" >
 <cdparam x="321" y="29" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="163" />
+<TGConnectingPoint num="0" id="173" />
 </COMPONENT>
 
-<CONNECTOR type="115" id="165" >
-<cdparam x="418" y="263" />
+<CONNECTOR type="115" id="175" >
+<cdparam x="452" y="124" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="452" y="124" id="152" />
+<P2  x="491" y="163" id="164" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="176" >
+<cdparam x="522" y="230" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="418" y="219" id="152" />
-<P2  x="418" y="283" id="160" />
+<P1  x="372" y="124" id="151" />
+<P2  x="334" y="162" id="170" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="166" >
+<CONNECTOR type="115" id="177" >
 <cdparam x="374" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="374" y="83" id="146" />
-<P2  x="418" y="142" id="154" />
+<P1  x="374" y="83" id="156" />
+<P2  x="412" y="99" id="150" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="167" >
-<cdparam x="418" y="172" />
+<CONNECTOR type="115" id="178" >
+<cdparam x="491" y="193" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="418" y="172" id="155" />
-<P2  x="418" y="179" id="151" />
+<P1  x="491" y="193" id="165" />
+<P2  x="491" y="230" id="161" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="168" >
-<cdparam x="418" y="313" />
+<CONNECTOR type="115" id="179" >
+<cdparam x="334" y="192" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="418" y="313" id="161" />
-<P2  x="418" y="347" id="157" />
+<P1  x="334" y="192" id="171" />
+<P2  x="334" y="226" id="167" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="169" >
-<cdparam x="418" y="377" />
+<CONNECTOR type="115" id="180" >
+<cdparam x="334" y="256" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="418" y="377" id="158" />
-<P2  x="418" y="408" id="148" />
+<P1  x="334" y="256" id="168" />
+<P2  x="334" y="287" id="158" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="170" >
+<CONNECTOR type="115" id="181" >
 <cdparam x="340" y="42" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="328" y="49" id="163" />
-<P2  x="328" y="64" id="145" />
+<P1  x="328" y="49" id="173" />
+<P2  x="328" y="64" id="155" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR>
+<CONNECTOR type="115" id="182" >
+<cdparam x="491" y="270" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<P1  x="491" y="270" id="162" />
+<P2  x="492" y="289" id="145" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
 </TMLActivityDiagramPanel>
 
 <TMLActivityDiagramPanel name="MainControl" minX="10" maxX="2500" minY="10" maxY="1500" >
-<COMPONENT type="301" id="187" >
+<COMPONENT type="301" id="199" >
 <cdparam x="10" y="434" />
 <sizeparam width="256" height="27" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -919,124 +982,124 @@
 <infoparam name="UML Note" value="Depending on the distance, calculate
 a motor command and new state
 " />
-<TGConnectingPoint num="0" id="171" />
-<TGConnectingPoint num="1" id="172" />
-<TGConnectingPoint num="2" id="173" />
-<TGConnectingPoint num="3" id="174" />
-<TGConnectingPoint num="4" id="175" />
-<TGConnectingPoint num="5" id="176" />
-<TGConnectingPoint num="6" id="177" />
-<TGConnectingPoint num="7" id="178" />
-<TGConnectingPoint num="8" id="179" />
-<TGConnectingPoint num="9" id="180" />
-<TGConnectingPoint num="10" id="181" />
-<TGConnectingPoint num="11" id="182" />
-<TGConnectingPoint num="12" id="183" />
-<TGConnectingPoint num="13" id="184" />
-<TGConnectingPoint num="14" id="185" />
-<TGConnectingPoint num="15" id="186" />
+<TGConnectingPoint num="0" id="183" />
+<TGConnectingPoint num="1" id="184" />
+<TGConnectingPoint num="2" id="185" />
+<TGConnectingPoint num="3" id="186" />
+<TGConnectingPoint num="4" id="187" />
+<TGConnectingPoint num="5" id="188" />
+<TGConnectingPoint num="6" id="189" />
+<TGConnectingPoint num="7" id="190" />
+<TGConnectingPoint num="8" id="191" />
+<TGConnectingPoint num="9" id="192" />
+<TGConnectingPoint num="10" id="193" />
+<TGConnectingPoint num="11" id="194" />
+<TGConnectingPoint num="12" id="195" />
+<TGConnectingPoint num="13" id="196" />
+<TGConnectingPoint num="14" id="197" />
+<TGConnectingPoint num="15" id="198" />
 <extraparam>
 <Line value="Depending on the distance, calculate" />
 <Line value="a motor command and new state" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="189" >
+<COMPONENT type="1001" id="201" >
 <cdparam x="1164" y="675" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="188" />
+<TGConnectingPoint num="0" id="200" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="191" >
+<COMPONENT type="1001" id="203" >
 <cdparam x="759" y="604" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="190" />
+<TGConnectingPoint num="0" id="202" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="193" >
+<COMPONENT type="1001" id="205" >
 <cdparam x="648" y="633" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="192" />
+<TGConnectingPoint num="0" id="204" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="195" >
+<COMPONENT type="1001" id="207" >
 <cdparam x="532" y="705" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="194" />
+<TGConnectingPoint num="0" id="206" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="197" >
+<COMPONENT type="1001" id="209" >
 <cdparam x="405" y="813" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="196" />
+<TGConnectingPoint num="0" id="208" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="199" >
+<COMPONENT type="1001" id="211" >
 <cdparam x="259" y="763" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="198" />
+<TGConnectingPoint num="0" id="210" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="201" >
+<COMPONENT type="1001" id="213" >
 <cdparam x="136" y="606" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="200" />
+<TGConnectingPoint num="0" id="212" />
 </COMPONENT>
 
-<COMPONENT type="1001" id="203" >
+<COMPONENT type="1001" id="215" >
 <cdparam x="510" y="109" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="202" />
+<TGConnectingPoint num="0" id="214" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="206" >
+<COMPONENT type="1009" id="218" >
 <cdparam x="1015" y="192" />
 <sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="tempData(1) " />
-<TGConnectingPoint num="0" id="204" />
-<TGConnectingPoint num="1" id="205" />
+<TGConnectingPoint num="0" id="216" />
+<TGConnectingPoint num="1" id="217" />
 <extraparam>
 <Data channelName="tempData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1013" id="210" >
+<COMPONENT type="1013" id="222" >
 <cdparam x="1057" y="303" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="208" />
-<TGConnectingPoint num="1" id="209" />
+<TGConnectingPoint num="0" id="220" />
+<TGConnectingPoint num="1" id="221" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="207" >
-<father id="210" num="0" />
+<SUBCOMPONENT type="-1" id="219" >
+<father id="222" num="0" />
 <cdparam x="1072" y="323" />
 <sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1044,17 +1107,17 @@ a motor command and new state
 <infoparam name="value of the delay" value="calculateDistance" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1013" id="214" >
+<COMPONENT type="1013" id="226" >
 <cdparam x="653" y="292" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="212" />
-<TGConnectingPoint num="1" id="213" />
+<TGConnectingPoint num="0" id="224" />
+<TGConnectingPoint num="1" id="225" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="211" >
-<father id="214" num="0" />
+<SUBCOMPONENT type="-1" id="223" >
+<father id="226" num="0" />
 <cdparam x="668" y="312" />
 <sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1062,54 +1125,54 @@ a motor command and new state
 <infoparam name="value of the delay" value="calculateDistance" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1008" id="217" >
+<COMPONENT type="1008" id="229" >
 <cdparam x="1022" y="707" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="stopTemp()" />
-<TGConnectingPoint num="0" id="215" />
-<TGConnectingPoint num="1" id="216" />
+<TGConnectingPoint num="0" id="227" />
+<TGConnectingPoint num="1" id="228" />
 <extraparam>
 <Data eventName="stopTemp" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="220" >
+<COMPONENT type="1008" id="232" >
 <cdparam x="869" y="697" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="stopTemp()" />
-<TGConnectingPoint num="0" id="218" />
-<TGConnectingPoint num="1" id="219" />
+<TGConnectingPoint num="0" id="230" />
+<TGConnectingPoint num="1" id="231" />
 <extraparam>
 <Data eventName="stopTemp" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1020" id="224" >
+<COMPONENT type="1020" id="236" >
 <cdparam x="471" y="67" />
 <sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="for loop" value="10" />
-<TGConnectingPoint num="0" id="221" />
-<TGConnectingPoint num="1" id="222" />
-<TGConnectingPoint num="2" id="223" />
+<TGConnectingPoint num="0" id="233" />
+<TGConnectingPoint num="1" id="234" />
+<TGConnectingPoint num="2" id="235" />
 </COMPONENT>
 
-<COMPONENT type="1013" id="228" >
+<COMPONENT type="1013" id="240" >
 <cdparam x="264" y="258" />
 <sizeparam width="10" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="execI" value="null" />
-<TGConnectingPoint num="0" id="226" />
-<TGConnectingPoint num="1" id="227" />
+<TGConnectingPoint num="0" id="238" />
+<TGConnectingPoint num="1" id="239" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="225" >
-<father id="228" num="0" />
+<SUBCOMPONENT type="-1" id="237" >
+<father id="240" num="0" />
 <cdparam x="279" y="278" />
 <sizeparam width="112" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1117,7 +1180,7 @@ a motor command and new state
 <infoparam name="value of the delay" value="calculateDistance" />
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="245" >
+<COMPONENT type="301" id="257" >
 <cdparam x="144" y="29" />
 <sizeparam width="311" height="39" minWidth="20" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1126,22 +1189,22 @@ a motor command and new state
 state 1: obstacles intermediate distance away
 state 2: obstacles in close proximity
 " />
-<TGConnectingPoint num="0" id="229" />
-<TGConnectingPoint num="1" id="230" />
-<TGConnectingPoint num="2" id="231" />
-<TGConnectingPoint num="3" id="232" />
-<TGConnectingPoint num="4" id="233" />
-<TGConnectingPoint num="5" id="234" />
-<TGConnectingPoint num="6" id="235" />
-<TGConnectingPoint num="7" id="236" />
-<TGConnectingPoint num="8" id="237" />
-<TGConnectingPoint num="9" id="238" />
-<TGConnectingPoint num="10" id="239" />
-<TGConnectingPoint num="11" id="240" />
-<TGConnectingPoint num="12" id="241" />
-<TGConnectingPoint num="13" id="242" />
-<TGConnectingPoint num="14" id="243" />
-<TGConnectingPoint num="15" id="244" />
+<TGConnectingPoint num="0" id="241" />
+<TGConnectingPoint num="1" id="242" />
+<TGConnectingPoint num="2" id="243" />
+<TGConnectingPoint num="3" id="244" />
+<TGConnectingPoint num="4" id="245" />
+<TGConnectingPoint num="5" id="246" />
+<TGConnectingPoint num="6" id="247" />
+<TGConnectingPoint num="7" id="248" />
+<TGConnectingPoint num="8" id="249" />
+<TGConnectingPoint num="9" id="250" />
+<TGConnectingPoint num="10" id="251" />
+<TGConnectingPoint num="11" id="252" />
+<TGConnectingPoint num="12" id="253" />
+<TGConnectingPoint num="13" id="254" />
+<TGConnectingPoint num="14" id="255" />
+<TGConnectingPoint num="15" id="256" />
 <extraparam>
 <Line value="state 0: obstacles far away" />
 <Line value="state 1: obstacles intermediate distance away" />
@@ -1149,35 +1212,35 @@ state 2: obstacles in close proximity
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="253" >
+<COMPONENT type="1012" id="265" >
 <cdparam x="1048" y="554" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="249" />
-<TGConnectingPoint num="1" id="250" />
-<TGConnectingPoint num="2" id="251" />
-<TGConnectingPoint num="3" id="252" />
+<TGConnectingPoint num="0" id="261" />
+<TGConnectingPoint num="1" id="262" />
+<TGConnectingPoint num="2" id="263" />
+<TGConnectingPoint num="3" id="264" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="246" >
-<father id="253" num="0" />
+<SUBCOMPONENT type="-1" id="258" >
+<father id="265" num="0" />
 <cdparam x="1023" y="564" />
 <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="247" >
-<father id="253" num="1" />
+<SUBCOMPONENT type="-1" id="259" >
+<father id="265" num="1" />
 <cdparam x="1083" y="564" />
 <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="248" >
-<father id="253" num="2" />
+<SUBCOMPONENT type="-1" id="260" >
+<father id="265" num="2" />
 <cdparam x="1068" y="599" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1185,35 +1248,35 @@ state 2: obstacles in close proximity
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="261" >
+<COMPONENT type="1012" id="273" >
 <cdparam x="643" y="484" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="257" />
-<TGConnectingPoint num="1" id="258" />
-<TGConnectingPoint num="2" id="259" />
-<TGConnectingPoint num="3" id="260" />
+<TGConnectingPoint num="0" id="269" />
+<TGConnectingPoint num="1" id="270" />
+<TGConnectingPoint num="2" id="271" />
+<TGConnectingPoint num="3" id="272" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="254" >
-<father id="261" num="0" />
+<SUBCOMPONENT type="-1" id="266" >
+<father id="273" num="0" />
 <cdparam x="618" y="494" />
 <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="255" >
-<father id="261" num="1" />
+<SUBCOMPONENT type="-1" id="267" >
+<father id="273" num="1" />
 <cdparam x="678" y="494" />
 <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="256" >
-<father id="261" num="2" />
+<SUBCOMPONENT type="-1" id="268" >
+<father id="273" num="2" />
 <cdparam x="663" y="529" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1221,130 +1284,130 @@ state 2: obstacles in close proximity
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1011" id="264" >
+<COMPONENT type="1011" id="276" >
 <cdparam x="385" y="553" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=2" />
-<TGConnectingPoint num="0" id="262" />
-<TGConnectingPoint num="1" id="263" />
+<TGConnectingPoint num="0" id="274" />
+<TGConnectingPoint num="1" id="275" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="267" >
+<COMPONENT type="1011" id="279" >
 <cdparam x="239" y="588" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=1" />
-<TGConnectingPoint num="0" id="265" />
-<TGConnectingPoint num="1" id="266" />
+<TGConnectingPoint num="0" id="277" />
+<TGConnectingPoint num="1" id="278" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="270" >
+<COMPONENT type="1011" id="282" >
 <cdparam x="116" y="548" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=0" />
-<TGConnectingPoint num="0" id="268" />
-<TGConnectingPoint num="1" id="269" />
+<TGConnectingPoint num="0" id="280" />
+<TGConnectingPoint num="1" id="281" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="273" >
+<COMPONENT type="1006" id="285" >
 <cdparam x="206" y="379" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="motorCommand(1)" />
-<TGConnectingPoint num="0" id="271" />
-<TGConnectingPoint num="1" id="272" />
+<TGConnectingPoint num="0" id="283" />
+<TGConnectingPoint num="1" id="284" />
 <extraparam>
 <Data channelName="motorCommand" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="276" >
+<COMPONENT type="1006" id="288" >
 <cdparam x="213" y="710" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="samplingRate(1)" />
-<TGConnectingPoint num="0" id="274" />
-<TGConnectingPoint num="1" id="275" />
+<TGConnectingPoint num="0" id="286" />
+<TGConnectingPoint num="1" id="287" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="279" >
+<COMPONENT type="1008" id="291" >
 <cdparam x="216" y="327" />
 <sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="newCommand()" />
-<TGConnectingPoint num="0" id="277" />
-<TGConnectingPoint num="1" id="278" />
+<TGConnectingPoint num="0" id="289" />
+<TGConnectingPoint num="1" id="290" />
 <extraparam>
 <Data eventName="newCommand" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="282" >
+<COMPONENT type="1008" id="294" >
 <cdparam x="221" y="655" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="changeRate()" />
-<TGConnectingPoint num="0" id="280" />
-<TGConnectingPoint num="1" id="281" />
+<TGConnectingPoint num="0" id="292" />
+<TGConnectingPoint num="1" id="293" />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="285" >
+<COMPONENT type="1008" id="297" >
 <cdparam x="373" y="761" />
 <sizeparam width="84" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="startTemp()" />
-<TGConnectingPoint num="0" id="283" />
-<TGConnectingPoint num="1" id="284" />
+<TGConnectingPoint num="0" id="295" />
+<TGConnectingPoint num="1" id="296" />
 <extraparam>
 <Data eventName="startTemp" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1012" id="293" >
+<COMPONENT type="1012" id="305" >
 <cdparam x="254" y="494" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="289" />
-<TGConnectingPoint num="1" id="290" />
-<TGConnectingPoint num="2" id="291" />
-<TGConnectingPoint num="3" id="292" />
+<TGConnectingPoint num="0" id="301" />
+<TGConnectingPoint num="1" id="302" />
+<TGConnectingPoint num="2" id="303" />
+<TGConnectingPoint num="3" id="304" />
 </COMPONENT>
-<SUBCOMPONENT type="-1" id="286" >
-<father id="293" num="0" />
+<SUBCOMPONENT type="-1" id="298" >
+<father id="305" num="0" />
 <cdparam x="229" y="504" />
 <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="287" >
-<father id="293" num="1" />
+<SUBCOMPONENT type="-1" id="299" >
+<father id="305" num="1" />
 <cdparam x="289" y="504" />
 <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="288" >
-<father id="293" num="2" />
+<SUBCOMPONENT type="-1" id="300" >
+<father id="305" num="2" />
 <cdparam x="274" y="539" />
 <sizeparam width="14" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1352,35 +1415,35 @@ state 2: obstacles in close proximity
 <infoparam name="guard 3" value="[ ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1012" id="301" >
+<COMPONENT type="1012" id="313" >
 <cdparam x="643" y="114" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="297" />
-<TGConnectingPoint num="1" id="298" />
-<TGConnectingPoint num="2" id="299" />
-<TGConnectingPoint num="3" id="300" />
+<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="294" >
-<father id="301" num="0" />
+<SUBCOMPONENT type="-1" id="306" >
+<father id="313" num="0" />
 <cdparam x="568" y="124" />
 <sizeparam width="75" 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="[ state==0]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="295" >
-<father id="301" num="1" />
+<SUBCOMPONENT type="-1" id="307" >
+<father id="313" num="1" />
 <cdparam x="678" y="124" />
 <sizeparam width="75" 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="[state==2 ]" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="296" >
-<father id="301" num="2" />
+<SUBCOMPONENT type="-1" id="308" >
+<father id="313" num="2" />
 <cdparam x="663" y="159" />
 <sizeparam width="75" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1388,707 +1451,707 @@ state 2: obstacles in close proximity
 <infoparam name="guard 3" value="[state==1 ]" />
 </SUBCOMPONENT>
 
-<COMPONENT type="1009" id="304" >
+<COMPONENT type="1009" id="316" >
 <cdparam x="207" y="195" />
 <sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="ultrasonicData(1) " />
-<TGConnectingPoint num="0" id="302" />
-<TGConnectingPoint num="1" id="303" />
+<TGConnectingPoint num="0" id="314" />
+<TGConnectingPoint num="1" id="315" />
 <extraparam>
 <Data channelName="ultrasonicData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1000" id="306" >
+<COMPONENT type="1000" id="318" >
 <cdparam x="513" y="10" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="305" />
+<TGConnectingPoint num="0" id="317" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="309" >
+<COMPONENT type="1011" id="321" >
 <cdparam x="739" y="546" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=2" />
-<TGConnectingPoint num="0" id="307" />
-<TGConnectingPoint num="1" id="308" />
+<TGConnectingPoint num="0" id="319" />
+<TGConnectingPoint num="1" id="320" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="312" >
+<COMPONENT type="1011" id="324" >
 <cdparam x="628" y="573" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=1" />
-<TGConnectingPoint num="0" id="310" />
-<TGConnectingPoint num="1" id="311" />
+<TGConnectingPoint num="0" id="322" />
+<TGConnectingPoint num="1" id="323" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="315" >
+<COMPONENT type="1011" id="327" >
 <cdparam x="512" y="539" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=0" />
-<TGConnectingPoint num="0" id="313" />
-<TGConnectingPoint num="1" id="314" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="318" >
+<COMPONENT type="1009" id="330" >
 <cdparam x="596" y="221" />
 <sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="ultrasonicData(1) " />
-<TGConnectingPoint num="0" id="316" />
-<TGConnectingPoint num="1" id="317" />
+<TGConnectingPoint num="0" id="328" />
+<TGConnectingPoint num="1" id="329" />
 <extraparam>
 <Data channelName="ultrasonicData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1011" id="321" >
+<COMPONENT type="1011" id="333" >
 <cdparam x="1144" y="616" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=2" />
-<TGConnectingPoint num="0" id="319" />
-<TGConnectingPoint num="1" id="320" />
+<TGConnectingPoint num="0" id="331" />
+<TGConnectingPoint num="1" id="332" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="324" >
+<COMPONENT type="1011" id="336" >
 <cdparam x="1033" y="647" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=1" />
-<TGConnectingPoint num="0" id="322" />
-<TGConnectingPoint num="1" id="323" />
+<TGConnectingPoint num="0" id="334" />
+<TGConnectingPoint num="1" id="335" />
 </COMPONENT>
 
-<COMPONENT type="1011" id="327" >
+<COMPONENT type="1011" id="339" >
 <cdparam x="880" y="624" />
 <sizeparam width="61" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="action state" value="state=0" />
-<TGConnectingPoint num="0" id="325" />
-<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="0" id="337" />
+<TGConnectingPoint num="1" id="338" />
 </COMPONENT>
 
-<COMPONENT type="1009" id="330" >
+<COMPONENT type="1009" id="342" >
 <cdparam x="1000" y="500" />
 <sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="ultrasonicData(1) " />
-<TGConnectingPoint num="0" id="328" />
-<TGConnectingPoint num="1" id="329" />
+<TGConnectingPoint num="0" id="340" />
+<TGConnectingPoint num="1" id="341" />
 <extraparam>
 <Data channelName="ultrasonicData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="333" >
+<COMPONENT type="1006" id="345" >
 <cdparam x="359" y="697" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="samplingRate(1)" />
-<TGConnectingPoint num="0" id="331" />
-<TGConnectingPoint num="1" id="332" />
+<TGConnectingPoint num="0" id="343" />
+<TGConnectingPoint num="1" id="344" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="336" >
+<COMPONENT type="1008" id="348" >
 <cdparam x="367" y="642" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="changeRate()" />
-<TGConnectingPoint num="0" id="334" />
-<TGConnectingPoint num="1" id="335" />
+<TGConnectingPoint num="0" id="346" />
+<TGConnectingPoint num="1" id="347" />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="339" >
+<COMPONENT type="1006" id="351" >
 <cdparam x="486" y="649" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="samplingRate(1)" />
-<TGConnectingPoint num="0" id="337" />
-<TGConnectingPoint num="1" id="338" />
+<TGConnectingPoint num="0" id="349" />
+<TGConnectingPoint num="1" id="350" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="342" >
+<COMPONENT type="1008" id="354" >
 <cdparam x="494" y="594" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="changeRate()" />
-<TGConnectingPoint num="0" id="340" />
-<TGConnectingPoint num="1" id="341" />
+<TGConnectingPoint num="0" id="352" />
+<TGConnectingPoint num="1" id="353" />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="345" >
+<COMPONENT type="1006" id="357" >
 <cdparam x="595" y="422" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="motorCommand(1)" />
-<TGConnectingPoint num="0" id="343" />
-<TGConnectingPoint num="1" id="344" />
+<TGConnectingPoint num="0" id="355" />
+<TGConnectingPoint num="1" id="356" />
 <extraparam>
 <Data channelName="motorCommand" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="348" >
+<COMPONENT type="1008" id="360" >
 <cdparam x="605" y="370" />
 <sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="newCommand()" />
-<TGConnectingPoint num="0" id="346" />
-<TGConnectingPoint num="1" id="347" />
+<TGConnectingPoint num="0" id="358" />
+<TGConnectingPoint num="1" id="359" />
 <extraparam>
 <Data eventName="newCommand" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1006" id="351" >
+<COMPONENT type="1006" id="363" >
 <cdparam x="999" y="422" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="motorCommand(1)" />
-<TGConnectingPoint num="0" id="349" />
-<TGConnectingPoint num="1" id="350" />
+<TGConnectingPoint num="0" id="361" />
+<TGConnectingPoint num="1" id="362" />
 <extraparam>
 <Data channelName="motorCommand" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="354" >
+<COMPONENT type="1008" id="366" >
 <cdparam x="1009" y="370" />
 <sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="newCommand()" />
-<TGConnectingPoint num="0" id="352" />
-<TGConnectingPoint num="1" id="353" />
+<TGConnectingPoint num="0" id="364" />
+<TGConnectingPoint num="1" id="365" />
 <extraparam>
 <Data eventName="newCommand" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1009" id="357" >
+<COMPONENT type="1009" id="369" >
 <cdparam x="1000" y="238" />
 <sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="read channel" value="ultrasonicData(1) " />
-<TGConnectingPoint num="0" id="355" />
-<TGConnectingPoint num="1" id="356" />
+<TGConnectingPoint num="0" id="367" />
+<TGConnectingPoint num="1" id="368" />
 <extraparam>
 <Data channelName="ultrasonicData" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="359" >
+<COMPONENT type="1001" id="371" >
 <cdparam x="900" y="862" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="358" />
+<TGConnectingPoint num="0" id="370" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="362" >
+<COMPONENT type="1006" id="374" >
 <cdparam x="854" y="809" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="samplingRate(1)" />
-<TGConnectingPoint num="0" id="360" />
-<TGConnectingPoint num="1" id="361" />
+<TGConnectingPoint num="0" id="372" />
+<TGConnectingPoint num="1" id="373" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="365" >
+<COMPONENT type="1008" id="377" >
 <cdparam x="862" y="754" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="changeRate()" />
-<TGConnectingPoint num="0" id="363" />
-<TGConnectingPoint num="1" id="364" />
+<TGConnectingPoint num="0" id="375" />
+<TGConnectingPoint num="1" id="376" />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1001" id="367" >
+<COMPONENT type="1001" id="379" >
 <cdparam x="1053" y="864" />
 <sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="366" />
+<TGConnectingPoint num="0" id="378" />
 </COMPONENT>
 
-<COMPONENT type="1006" id="370" >
+<COMPONENT type="1006" id="382" >
 <cdparam x="1007" y="811" />
 <sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="write channel" value="samplingRate(1)" />
-<TGConnectingPoint num="0" id="368" />
-<TGConnectingPoint num="1" id="369" />
+<TGConnectingPoint num="0" id="380" />
+<TGConnectingPoint num="1" id="381" />
 <extraparam>
 <Data channelName="samplingRate" nbOfSamples="1" secPattern="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1008" id="373" >
+<COMPONENT type="1008" id="385" >
 <cdparam x="1015" y="756" />
 <sizeparam width="96" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="send event" value="changeRate()" />
-<TGConnectingPoint num="0" id="371" />
-<TGConnectingPoint num="1" id="372" />
+<TGConnectingPoint num="0" id="383" />
+<TGConnectingPoint num="1" id="384" />
 <extraparam>
 <Data eventName="changeRate" nbOfParams="5" />
 </extraparam>
 </COMPONENT>
 
-<CONNECTOR type="115" id="374" >
+<CONNECTOR type="115" id="386" >
 <cdparam x="1063" y="732" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1063" y="732" id="216" />
-<P2  x="1063" y="751" id="371" />
+<P1  x="1063" y="732" id="228" />
+<P2  x="1063" y="751" id="383" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="375" >
+<CONNECTOR type="115" id="387" >
 <cdparam x="910" y="722" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="910" y="722" id="219" />
-<P2  x="910" y="749" id="363" />
+<P1  x="910" y="722" id="231" />
+<P2  x="910" y="749" id="375" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="376" >
+<CONNECTOR type="115" id="388" >
 <cdparam x="1062" y="447" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="447" id="350" />
-<P2  x="1062" y="495" id="328" />
+<P1  x="1062" y="447" id="362" />
+<P2  x="1062" y="495" id="340" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="377" >
+<CONNECTOR type="115" id="389" >
 <cdparam x="1063" y="219" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="217" id="205" />
-<P2  x="1062" y="233" id="355" />
+<P1  x="1062" y="217" id="217" />
+<P2  x="1062" y="233" id="367" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="378" >
+<CONNECTOR type="115" id="390" >
 <cdparam x="658" y="447" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="447" id="344" />
-<P2  x="658" y="474" id="257" />
+<P1  x="658" y="447" id="356" />
+<P2  x="658" y="474" id="269" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="379" >
+<CONNECTOR type="115" id="391" >
 <cdparam x="269" y="404" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="404" id="272" />
-<P2  x="269" y="484" id="289" />
+<P1  x="269" y="404" id="284" />
+<P2  x="269" y="484" id="301" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="380" >
+<CONNECTOR type="115" id="392" >
 <cdparam x="606" y="81" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="569" y="81" id="222" />
-<P2  x="658" y="104" id="297" />
+<P1  x="569" y="81" id="234" />
+<P2  x="658" y="104" id="309" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="381" >
+<CONNECTOR type="115" id="393" >
 <cdparam x="542" y="564" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="542" y="564" id="314" />
-<P2  x="542" y="589" id="340" />
+<P1  x="542" y="564" id="326" />
+<P2  x="542" y="589" id="352" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="382" >
+<CONNECTOR type="115" id="394" >
 <cdparam x="269" y="293" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="293" id="227" />
-<P2  x="269" y="322" id="277" />
+<P1  x="269" y="293" id="239" />
+<P2  x="269" y="322" id="289" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="383" >
+<CONNECTOR type="115" id="395" >
 <cdparam x="415" y="722" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="415" y="722" id="332" />
-<P2  x="415" y="756" id="283" />
+<P1  x="415" y="722" id="344" />
+<P2  x="415" y="756" id="295" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="384" >
+<CONNECTOR type="115" id="396" >
 <cdparam x="394" y="577" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="415" y="578" id="263" />
-<P2  x="415" y="637" id="334" />
+<P1  x="415" y="578" id="275" />
+<P2  x="415" y="637" id="346" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="385" >
+<CONNECTOR type="115" id="397" >
 <cdparam x="269" y="613" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="613" id="266" />
-<P2  x="269" y="650" id="280" />
+<P1  x="269" y="613" id="278" />
+<P2  x="269" y="650" id="292" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="386" >
+<CONNECTOR type="115" id="398" >
 <cdparam x="658" y="169" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="169" id="300" />
-<P2  x="658" y="216" id="316" />
+<P1  x="658" y="169" id="312" />
+<P2  x="658" y="216" id="328" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="387" >
+<CONNECTOR type="115" id="399" >
 <cdparam x="698" y="129" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="698" y="129" id="299" />
-<P2  x="1062" y="187" id="204" />
+<P1  x="698" y="129" id="311" />
+<P2  x="1062" y="187" id="216" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="388" >
+<CONNECTOR type="115" id="400" >
 <cdparam x="621" y="71" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="520" y="30" id="305" />
-<P2  x="520" y="62" id="221" />
+<P1  x="520" y="30" id="317" />
+<P2  x="520" y="62" id="233" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="389" >
+<CONNECTOR type="115" id="401" >
 <cdparam x="375" y="118" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="618" y="129" id="298" />
-<P2  x="269" y="190" id="302" />
+<P1  x="618" y="129" id="310" />
+<P2  x="269" y="190" id="314" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="390" >
+<CONNECTOR type="115" id="402" >
 <cdparam x="270" y="211" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="220" id="303" />
-<P2  x="269" y="253" id="226" />
+<P1  x="269" y="220" id="315" />
+<P2  x="269" y="253" id="238" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="391" >
+<CONNECTOR type="115" id="403" >
 <cdparam x="269" y="680" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="680" id="281" />
-<P2  x="269" y="705" id="274" />
+<P1  x="269" y="680" id="293" />
+<P2  x="269" y="705" id="286" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="392" >
+<CONNECTOR type="115" id="404" >
 <cdparam x="278" y="345" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="352" id="278" />
-<P2  x="269" y="374" id="271" />
+<P1  x="269" y="352" id="290" />
+<P2  x="269" y="374" id="283" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="393" >
+<CONNECTOR type="115" id="405" >
 <cdparam x="229" y="509" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="229" y="509" id="290" />
-<P2  x="146" y="543" id="268" />
+<P1  x="229" y="509" id="302" />
+<P2  x="146" y="543" id="280" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="394" >
+<CONNECTOR type="115" id="406" >
 <cdparam x="269" y="549" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="549" id="292" />
-<P2  x="269" y="583" id="265" />
+<P1  x="269" y="549" id="304" />
+<P2  x="269" y="583" id="277" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="395" >
+<CONNECTOR type="115" id="407" >
 <cdparam x="406" y="505" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="309" y="509" id="291" />
-<P2  x="415" y="548" id="262" />
+<P1  x="309" y="509" id="303" />
+<P2  x="415" y="548" id="274" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="396" >
+<CONNECTOR type="115" id="408" >
 <cdparam x="659" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="246" id="317" />
-<P2  x="658" y="287" id="212" />
+<P1  x="658" y="246" id="329" />
+<P2  x="658" y="287" id="224" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="397" >
+<CONNECTOR type="115" id="409" >
 <cdparam x="618" y="499" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="618" y="499" id="258" />
-<P2  x="542" y="534" id="313" />
+<P1  x="618" y="499" id="270" />
+<P2  x="542" y="534" id="325" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="398" >
+<CONNECTOR type="115" id="410" >
 <cdparam x="658" y="539" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="539" id="260" />
-<P2  x="658" y="568" id="310" />
+<P1  x="658" y="539" id="272" />
+<P2  x="658" y="568" id="322" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="399" >
+<CONNECTOR type="115" id="411" >
 <cdparam x="795" y="495" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="698" y="499" id="259" />
-<P2  x="769" y="541" id="307" />
+<P1  x="698" y="499" id="271" />
+<P2  x="769" y="541" id="319" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="400" >
+<CONNECTOR type="115" id="412" >
 <cdparam x="1063" y="516" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="525" id="329" />
-<P2  x="1063" y="544" id="249" />
+<P1  x="1062" y="525" id="341" />
+<P2  x="1063" y="544" id="261" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="401" >
+<CONNECTOR type="115" id="413" >
 <cdparam x="1023" y="569" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1023" y="569" id="250" />
-<P2  x="910" y="619" id="325" />
+<P1  x="1023" y="569" id="262" />
+<P2  x="910" y="619" id="337" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="402" >
+<CONNECTOR type="115" id="414" >
 <cdparam x="1063" y="609" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1063" y="609" id="252" />
-<P2  x="1063" y="642" id="322" />
+<P1  x="1063" y="609" id="264" />
+<P2  x="1063" y="642" id="334" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="403" >
+<CONNECTOR type="115" id="415" >
 <cdparam x="1200" y="565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1103" y="569" id="251" />
-<P2  x="1174" y="611" id="319" />
+<P1  x="1103" y="569" id="263" />
+<P2  x="1174" y="611" id="331" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="404" >
+<CONNECTOR type="115" id="416" >
 <cdparam x="415" y="667" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="415" y="667" id="335" />
-<P2  x="415" y="692" id="331" />
+<P1  x="415" y="667" id="347" />
+<P2  x="415" y="692" id="343" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="405" >
+<CONNECTOR type="115" id="417" >
 <cdparam x="542" y="619" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="542" y="619" id="341" />
-<P2  x="542" y="644" id="337" />
+<P1  x="542" y="619" id="353" />
+<P2  x="542" y="644" id="349" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="406" >
+<CONNECTOR type="115" id="418" >
 <cdparam x="910" y="649" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="910" y="649" id="326" />
-<P2  x="910" y="692" id="218" />
+<P1  x="910" y="649" id="338" />
+<P2  x="910" y="692" id="230" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="407" >
+<CONNECTOR type="115" id="419" >
 <cdparam x="1063" y="672" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1063" y="672" id="323" />
-<P2  x="1063" y="702" id="215" />
+<P1  x="1063" y="672" id="335" />
+<P2  x="1063" y="702" id="227" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="408" >
+<CONNECTOR type="115" id="420" >
 <cdparam x="658" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="327" id="213" />
-<P2  x="658" y="365" id="346" />
+<P1  x="658" y="327" id="225" />
+<P2  x="658" y="365" id="358" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="409" >
+<CONNECTOR type="115" id="421" >
 <cdparam x="667" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="395" id="347" />
-<P2  x="658" y="417" id="343" />
+<P1  x="658" y="395" id="359" />
+<P2  x="658" y="417" id="355" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="410" >
+<CONNECTOR type="115" id="422" >
 <cdparam x="1062" y="336" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="338" id="209" />
-<P2  x="1062" y="365" id="352" />
+<P1  x="1062" y="338" id="221" />
+<P2  x="1062" y="365" id="364" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="411" >
+<CONNECTOR type="115" id="423" >
 <cdparam x="1063" y="254" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="263" id="356" />
-<P2  x="1062" y="298" id="208" />
+<P1  x="1062" y="263" id="368" />
+<P2  x="1062" y="298" id="220" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="412" >
+<CONNECTOR type="115" id="424" >
 <cdparam x="1071" y="388" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1062" y="395" id="353" />
-<P2  x="1062" y="417" id="349" />
+<P1  x="1062" y="395" id="365" />
+<P2  x="1062" y="417" id="361" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="413" >
+<CONNECTOR type="115" id="425" >
 <cdparam x="520" y="92" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="520" y="92" id="223" />
-<P2  x="520" y="104" id="202" />
+<P1  x="520" y="92" id="235" />
+<P2  x="520" y="104" id="214" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="414" >
+<CONNECTOR type="115" id="426" >
 <cdparam x="146" y="573" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="146" y="573" id="269" />
-<P2  x="146" y="601" id="200" />
+<P1  x="146" y="573" id="281" />
+<P2  x="146" y="601" id="212" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="415" >
+<CONNECTOR type="115" id="427" >
 <cdparam x="269" y="735" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="269" y="735" id="275" />
-<P2  x="269" y="758" id="198" />
+<P1  x="269" y="735" id="287" />
+<P2  x="269" y="758" id="210" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="416" >
+<CONNECTOR type="115" id="428" >
 <cdparam x="415" y="786" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="415" y="786" id="284" />
-<P2  x="415" y="808" id="196" />
+<P1  x="415" y="786" id="296" />
+<P2  x="415" y="808" id="208" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="417" >
+<CONNECTOR type="115" id="429" >
 <cdparam x="542" y="674" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="542" y="674" id="338" />
-<P2  x="542" y="700" id="194" />
+<P1  x="542" y="674" id="350" />
+<P2  x="542" y="700" id="206" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="418" >
+<CONNECTOR type="115" id="430" >
 <cdparam x="658" y="598" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="658" y="598" id="311" />
-<P2  x="658" y="628" id="192" />
+<P1  x="658" y="598" id="323" />
+<P2  x="658" y="628" id="204" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="419" >
+<CONNECTOR type="115" id="431" >
 <cdparam x="769" y="571" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="769" y="571" id="308" />
-<P2  x="769" y="599" id="190" />
+<P1  x="769" y="571" id="320" />
+<P2  x="769" y="599" id="202" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="420" >
+<CONNECTOR type="115" id="432" >
 <cdparam x="1174" y="641" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1174" y="641" id="320" />
-<P2  x="1174" y="670" id="188" />
+<P1  x="1174" y="641" id="332" />
+<P2  x="1174" y="670" id="200" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="421" >
+<CONNECTOR type="115" id="433" >
 <cdparam x="910" y="779" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="910" y="779" id="364" />
-<P2  x="910" y="804" id="360" />
+<P1  x="910" y="779" id="376" />
+<P2  x="910" y="804" id="372" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="422" >
+<CONNECTOR type="115" id="434" >
 <cdparam x="910" y="834" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="910" y="834" id="361" />
-<P2  x="910" y="857" id="358" />
+<P1  x="910" y="834" id="373" />
+<P2  x="910" y="857" id="370" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="423" >
+<CONNECTOR type="115" id="435" >
 <cdparam x="1063" y="781" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1063" y="781" id="372" />
-<P2  x="1063" y="806" id="368" />
+<P1  x="1063" y="781" id="384" />
+<P2  x="1063" y="806" id="380" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="115" id="424" >
+<CONNECTOR type="115" id="436" >
 <cdparam x="1063" y="836" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<P1  x="1063" y="836" id="369" />
-<P2  x="1063" y="859" id="366" />
+<P1  x="1063" y="836" id="381" />
+<P2  x="1063" y="859" id="378" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -2101,208 +2164,208 @@ state 2: obstacles in close proximity
 
 <Modeling type="TML Architecture" nameTab="Architecture" >
 <TMLArchiDiagramPanel name="DIPLODOCUS architecture and mapping Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="1102" id="449" >
+<COMPONENT type="1102" id="461" >
 <cdparam x="531" y="29" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="425" />
-<TGConnectingPoint num="1" id="426" />
-<TGConnectingPoint num="2" id="427" />
-<TGConnectingPoint num="3" id="428" />
-<TGConnectingPoint num="4" id="429" />
-<TGConnectingPoint num="5" id="430" />
-<TGConnectingPoint num="6" id="431" />
-<TGConnectingPoint num="7" id="432" />
-<TGConnectingPoint num="8" id="433" />
-<TGConnectingPoint num="9" id="434" />
-<TGConnectingPoint num="10" id="435" />
-<TGConnectingPoint num="11" id="436" />
-<TGConnectingPoint num="12" id="437" />
-<TGConnectingPoint num="13" id="438" />
-<TGConnectingPoint num="14" id="439" />
-<TGConnectingPoint num="15" id="440" />
-<TGConnectingPoint num="16" id="441" />
-<TGConnectingPoint num="17" id="442" />
-<TGConnectingPoint num="18" id="443" />
-<TGConnectingPoint num="19" id="444" />
-<TGConnectingPoint num="20" id="445" />
-<TGConnectingPoint num="21" id="446" />
-<TGConnectingPoint num="22" id="447" />
-<TGConnectingPoint num="23" id="448" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="2" id="439" />
+<TGConnectingPoint num="3" id="440" />
+<TGConnectingPoint num="4" id="441" />
+<TGConnectingPoint num="5" id="442" />
+<TGConnectingPoint num="6" id="443" />
+<TGConnectingPoint num="7" id="444" />
+<TGConnectingPoint num="8" id="445" />
+<TGConnectingPoint num="9" id="446" />
+<TGConnectingPoint num="10" id="447" />
+<TGConnectingPoint num="11" id="448" />
+<TGConnectingPoint num="12" id="449" />
+<TGConnectingPoint num="13" id="450" />
+<TGConnectingPoint num="14" id="451" />
+<TGConnectingPoint num="15" id="452" />
+<TGConnectingPoint num="16" id="453" />
+<TGConnectingPoint num="17" id="454" />
+<TGConnectingPoint num="18" id="455" />
+<TGConnectingPoint num="19" id="456" />
+<TGConnectingPoint num="20" id="457" />
+<TGConnectingPoint num="21" id="458" />
+<TGConnectingPoint num="22" id="459" />
+<TGConnectingPoint num="23" id="460" />
 <extraparam>
 <info stereotype="BUS" nodeName="Bus0" />
 <attributes byteDataSize="4"  arbitrationPolicy="0"  sliceTime="10000"  pipelineSize="1"  clockRatio="1"  privacy="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1105" id="474" >
+<COMPONENT type="1105" id="486" >
 <cdparam x="668" y="98" />
 <sizeparam width="200" height="214" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="450" />
-<TGConnectingPoint num="1" id="451" />
-<TGConnectingPoint num="2" id="452" />
-<TGConnectingPoint num="3" id="453" />
-<TGConnectingPoint num="4" id="454" />
-<TGConnectingPoint num="5" id="455" />
-<TGConnectingPoint num="6" id="456" />
-<TGConnectingPoint num="7" id="457" />
-<TGConnectingPoint num="8" id="458" />
-<TGConnectingPoint num="9" id="459" />
-<TGConnectingPoint num="10" id="460" />
-<TGConnectingPoint num="11" id="461" />
-<TGConnectingPoint num="12" id="462" />
-<TGConnectingPoint num="13" id="463" />
-<TGConnectingPoint num="14" id="464" />
-<TGConnectingPoint num="15" id="465" />
-<TGConnectingPoint num="16" id="466" />
-<TGConnectingPoint num="17" id="467" />
-<TGConnectingPoint num="18" id="468" />
-<TGConnectingPoint num="19" id="469" />
-<TGConnectingPoint num="20" id="470" />
-<TGConnectingPoint num="21" id="471" />
-<TGConnectingPoint num="22" id="472" />
-<TGConnectingPoint num="23" id="473" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
+<TGConnectingPoint num="4" id="466" />
+<TGConnectingPoint num="5" id="467" />
+<TGConnectingPoint num="6" id="468" />
+<TGConnectingPoint num="7" id="469" />
+<TGConnectingPoint num="8" id="470" />
+<TGConnectingPoint num="9" id="471" />
+<TGConnectingPoint num="10" id="472" />
+<TGConnectingPoint num="11" id="473" />
+<TGConnectingPoint num="12" id="474" />
+<TGConnectingPoint num="13" id="475" />
+<TGConnectingPoint num="14" id="476" />
+<TGConnectingPoint num="15" id="477" />
+<TGConnectingPoint num="16" id="478" />
+<TGConnectingPoint num="17" id="479" />
+<TGConnectingPoint num="18" id="480" />
+<TGConnectingPoint num="19" id="481" />
+<TGConnectingPoint num="20" id="482" />
+<TGConnectingPoint num="21" id="483" />
+<TGConnectingPoint num="22" id="484" />
+<TGConnectingPoint num="23" id="485" />
 <extraparam>
 <info stereotype="MEMORY" nodeName="Memory0" />
 <attributes byteDataSize="4"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1100" id="535" >
+<COMPONENT type="1100" id="547" >
 <cdparam x="428" y="98" />
 <sizeparam width="220" height="215" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="511" />
-<TGConnectingPoint num="1" id="512" />
-<TGConnectingPoint num="2" id="513" />
-<TGConnectingPoint num="3" id="514" />
-<TGConnectingPoint num="4" id="515" />
-<TGConnectingPoint num="5" id="516" />
-<TGConnectingPoint num="6" id="517" />
-<TGConnectingPoint num="7" id="518" />
-<TGConnectingPoint num="8" id="519" />
-<TGConnectingPoint num="9" id="520" />
-<TGConnectingPoint num="10" id="521" />
-<TGConnectingPoint num="11" id="522" />
-<TGConnectingPoint num="12" id="523" />
-<TGConnectingPoint num="13" id="524" />
-<TGConnectingPoint num="14" id="525" />
-<TGConnectingPoint num="15" id="526" />
-<TGConnectingPoint num="16" id="527" />
-<TGConnectingPoint num="17" id="528" />
-<TGConnectingPoint num="18" id="529" />
-<TGConnectingPoint num="19" id="530" />
-<TGConnectingPoint num="20" id="531" />
-<TGConnectingPoint num="21" id="532" />
-<TGConnectingPoint num="22" id="533" />
-<TGConnectingPoint num="23" id="534" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
+<TGConnectingPoint num="8" id="531" />
+<TGConnectingPoint num="9" id="532" />
+<TGConnectingPoint num="10" id="533" />
+<TGConnectingPoint num="11" id="534" />
+<TGConnectingPoint num="12" id="535" />
+<TGConnectingPoint num="13" id="536" />
+<TGConnectingPoint num="14" id="537" />
+<TGConnectingPoint num="15" id="538" />
+<TGConnectingPoint num="16" id="539" />
+<TGConnectingPoint num="17" id="540" />
+<TGConnectingPoint num="18" id="541" />
+<TGConnectingPoint num="19" id="542" />
+<TGConnectingPoint num="20" id="543" />
+<TGConnectingPoint num="21" id="544" />
+<TGConnectingPoint num="22" id="545" />
+<TGConnectingPoint num="23" id="546" />
 <extraparam>
 <info stereotype="CPU" nodeName="CPU0" />
 <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="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="483" >
-<father id="535" num="0" />
+<SUBCOMPONENT type="1101" id="495" >
+<father id="547" num="0" />
 <cdparam x="435" y="179" />
 <sizeparam width="159" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="61" minY="0" maxY="175" />
 <infoparam name="TGComponent" value="Rover::MotorControl" />
-<TGConnectingPoint num="0" id="475" />
-<TGConnectingPoint num="1" id="476" />
-<TGConnectingPoint num="2" id="477" />
-<TGConnectingPoint num="3" id="478" />
-<TGConnectingPoint num="4" id="479" />
-<TGConnectingPoint num="5" id="480" />
-<TGConnectingPoint num="6" id="481" />
-<TGConnectingPoint num="7" id="482" />
+<TGConnectingPoint num="0" id="487" />
+<TGConnectingPoint num="1" id="488" />
+<TGConnectingPoint num="2" id="489" />
+<TGConnectingPoint num="3" id="490" />
+<TGConnectingPoint num="4" id="491" />
+<TGConnectingPoint num="5" id="492" />
+<TGConnectingPoint num="6" id="493" />
+<TGConnectingPoint num="7" id="494" />
 <extraparam>
 <info value="Rover::MotorControl" taskName="MotorControl" referenceTaskName="Rover" priority="0" operation="MotorControl" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="492" >
-<father id="535" num="1" />
+<SUBCOMPONENT type="1101" id="504" >
+<father id="547" num="1" />
 <cdparam x="435" y="267" />
-<sizeparam width="201" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="203" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="19" minY="0" maxY="175" />
+<cdrectangleparam minX="0" maxX="17" minY="0" maxY="175" />
 <infoparam name="TGComponent" value="Rover::TemperatureSensor" />
-<TGConnectingPoint num="0" id="484" />
-<TGConnectingPoint num="1" id="485" />
-<TGConnectingPoint num="2" id="486" />
-<TGConnectingPoint num="3" id="487" />
-<TGConnectingPoint num="4" id="488" />
-<TGConnectingPoint num="5" id="489" />
-<TGConnectingPoint num="6" id="490" />
-<TGConnectingPoint num="7" id="491" />
+<TGConnectingPoint num="0" id="496" />
+<TGConnectingPoint num="1" id="497" />
+<TGConnectingPoint num="2" id="498" />
+<TGConnectingPoint num="3" id="499" />
+<TGConnectingPoint num="4" id="500" />
+<TGConnectingPoint num="5" id="501" />
+<TGConnectingPoint num="6" id="502" />
+<TGConnectingPoint num="7" id="503" />
 <extraparam>
 <info value="Rover::TemperatureSensor" taskName="TemperatureSensor" referenceTaskName="Rover" priority="0" operation="TemperatureSensor" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="501" >
-<father id="535" num="2" />
+<SUBCOMPONENT type="1101" id="513" >
+<father id="547" num="2" />
 <cdparam x="435" y="223" />
-<sizeparam width="175" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="177" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="45" minY="0" maxY="175" />
+<cdrectangleparam minX="0" maxX="43" minY="0" maxY="175" />
 <infoparam name="TGComponent" value="Rover::DistanceSensor" />
-<TGConnectingPoint num="0" id="493" />
-<TGConnectingPoint num="1" id="494" />
-<TGConnectingPoint num="2" id="495" />
-<TGConnectingPoint num="3" id="496" />
-<TGConnectingPoint num="4" id="497" />
-<TGConnectingPoint num="5" id="498" />
-<TGConnectingPoint num="6" id="499" />
-<TGConnectingPoint num="7" id="500" />
+<TGConnectingPoint num="0" id="505" />
+<TGConnectingPoint num="1" id="506" />
+<TGConnectingPoint num="2" id="507" />
+<TGConnectingPoint num="3" id="508" />
+<TGConnectingPoint num="4" id="509" />
+<TGConnectingPoint num="5" id="510" />
+<TGConnectingPoint num="6" id="511" />
+<TGConnectingPoint num="7" id="512" />
 <extraparam>
 <info value="Rover::DistanceSensor" taskName="DistanceSensor" referenceTaskName="Rover" priority="0" operation="DistanceSensor" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="510" >
-<father id="535" num="3" />
+<SUBCOMPONENT type="1101" id="522" >
+<father id="547" num="3" />
 <cdparam x="436" y="135" />
-<sizeparam width="151" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="152" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="69" minY="0" maxY="175" />
+<cdrectangleparam minX="0" maxX="68" minY="0" maxY="175" />
 <infoparam name="TGComponent" value="Rover::MainControl" />
-<TGConnectingPoint num="0" id="502" />
-<TGConnectingPoint num="1" id="503" />
-<TGConnectingPoint num="2" id="504" />
-<TGConnectingPoint num="3" id="505" />
-<TGConnectingPoint num="4" id="506" />
-<TGConnectingPoint num="5" id="507" />
-<TGConnectingPoint num="6" id="508" />
-<TGConnectingPoint num="7" id="509" />
+<TGConnectingPoint num="0" id="514" />
+<TGConnectingPoint num="1" id="515" />
+<TGConnectingPoint num="2" id="516" />
+<TGConnectingPoint num="3" id="517" />
+<TGConnectingPoint num="4" id="518" />
+<TGConnectingPoint num="5" id="519" />
+<TGConnectingPoint num="6" id="520" />
+<TGConnectingPoint num="7" id="521" />
 <extraparam>
 <info value="Rover::MainControl" taskName="MainControl" referenceTaskName="Rover" priority="0" operation="MainControl" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="125" id="536" >
+<CONNECTOR type="125" id="548" >
 <cdparam x="729" y="103" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="718" y="98" id="458" />
-<P2  x="718" y="79" id="440" />
+<P1  x="718" y="98" id="470" />
+<P2  x="718" y="79" id="452" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="125" id="537" >
+<CONNECTOR type="125" id="549" >
 <cdparam x="524" y="102" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="593" y="98" id="520" />
-<P2  x="593" y="79" id="439" />
+<P1  x="593" y="98" id="532" />
+<P2  x="593" y="79" id="451" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <info priority="0" />
@@ -2322,16 +2385,16 @@ state 2: obstacles in close proximity
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="false" />
-<Validated value="" />
+<Validated value="MotorControl;TemperatureSensor;DistanceSensor;MainControl;" />
 <Ignored value="" />
 
-<CONNECTOR type="5002" id="539" >
+<CONNECTOR type="5002" id="551" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="538" />
-<P1  x="514" y="618" id="648" />
-<P2  x="461" y="582" id="622" />
+<TGConnectingPoint num="0" id="550" />
+<P1  x="514" y="618" id="660" />
+<P2  x="461" y="582" id="634" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in sensorData(int distanceLeft, int distanceFront, int distanceRight)" />
@@ -2341,13 +2404,13 @@ state 2: obstacles in close proximity
 <FIFOType asynchronous="true" size="8" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="541" >
+<CONNECTOR type="5002" id="553" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="540" />
-<P1  x="950" y="422" id="647" />
-<P2  x="1013" y="421" id="564" />
+<TGConnectingPoint num="0" id="552" />
+<P1  x="950" y="422" id="659" />
+<P2  x="1013" y="421" id="576" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <isd value="in motorCommand(int leftCommand, int rightCommand)" />
@@ -2355,13 +2418,13 @@ state 2: obstacles in close proximity
 <FIFOType asynchronous="true" size="8" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5002" id="543" >
+<CONNECTOR type="5002" id="555" >
 <cdparam x="0" y="0" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="542" />
-<P1  x="514" y="520" id="639" />
-<P2  x="456" y="426" id="590" />
+<TGConnectingPoint num="0" id="554" />
+<P1  x="514" y="520" id="651" />
+<P2  x="456" y="426" id="602" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <iso value="in tempData(int temp)" />
@@ -2371,63 +2434,63 @@ state 2: obstacles in close proximity
 <FIFOType asynchronous="true" size="8" blocking="false" private="false" broadcast="false" lossy="false" />
 </extraparam>
 </CONNECTOR>
-<COMPONENT type="302" id="560" >
+<COMPONENT type="302" id="572" >
 <cdparam x="810" y="140" />
-<sizeparam width="257" height="58" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="255" height="58" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Proverif Pragma" value="
 " />
-<TGConnectingPoint num="0" id="544" />
-<TGConnectingPoint num="1" id="545" />
-<TGConnectingPoint num="2" id="546" />
-<TGConnectingPoint num="3" id="547" />
-<TGConnectingPoint num="4" id="548" />
-<TGConnectingPoint num="5" id="549" />
-<TGConnectingPoint num="6" id="550" />
-<TGConnectingPoint num="7" id="551" />
-<TGConnectingPoint num="8" id="552" />
-<TGConnectingPoint num="9" id="553" />
-<TGConnectingPoint num="10" id="554" />
-<TGConnectingPoint num="11" id="555" />
-<TGConnectingPoint num="12" id="556" />
-<TGConnectingPoint num="13" id="557" />
-<TGConnectingPoint num="14" id="558" />
-<TGConnectingPoint num="15" id="559" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="585" >
+<TGConnectingPoint num="0" id="556" />
+<TGConnectingPoint num="1" id="557" />
+<TGConnectingPoint num="2" id="558" />
+<TGConnectingPoint num="3" id="559" />
+<TGConnectingPoint num="4" id="560" />
+<TGConnectingPoint num="5" id="561" />
+<TGConnectingPoint num="6" id="562" />
+<TGConnectingPoint num="7" id="563" />
+<TGConnectingPoint num="8" id="564" />
+<TGConnectingPoint num="9" id="565" />
+<TGConnectingPoint num="10" id="566" />
+<TGConnectingPoint num="11" id="567" />
+<TGConnectingPoint num="12" id="568" />
+<TGConnectingPoint num="13" id="569" />
+<TGConnectingPoint num="14" id="570" />
+<TGConnectingPoint num="15" id="571" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5000" id="597" >
 <cdparam x="1013" y="318" />
 <sizeparam width="370" height="206" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block0" value="MotorControl" />
-<TGConnectingPoint num="0" id="561" />
-<TGConnectingPoint num="1" id="562" />
-<TGConnectingPoint num="2" id="563" />
-<TGConnectingPoint num="3" id="564" />
-<TGConnectingPoint num="4" id="565" />
-<TGConnectingPoint num="5" id="566" />
-<TGConnectingPoint num="6" id="567" />
-<TGConnectingPoint num="7" id="568" />
-<TGConnectingPoint num="8" id="569" />
-<TGConnectingPoint num="9" id="570" />
-<TGConnectingPoint num="10" id="571" />
-<TGConnectingPoint num="11" id="572" />
-<TGConnectingPoint num="12" id="573" />
-<TGConnectingPoint num="13" id="574" />
-<TGConnectingPoint num="14" id="575" />
-<TGConnectingPoint num="15" id="576" />
-<TGConnectingPoint num="16" id="577" />
-<TGConnectingPoint num="17" id="578" />
-<TGConnectingPoint num="18" id="579" />
-<TGConnectingPoint num="19" id="580" />
-<TGConnectingPoint num="20" id="581" />
-<TGConnectingPoint num="21" id="582" />
-<TGConnectingPoint num="22" id="583" />
-<TGConnectingPoint num="23" id="584" />
+<TGConnectingPoint num="0" id="573" />
+<TGConnectingPoint num="1" id="574" />
+<TGConnectingPoint num="2" id="575" />
+<TGConnectingPoint num="3" id="576" />
+<TGConnectingPoint num="4" id="577" />
+<TGConnectingPoint num="5" id="578" />
+<TGConnectingPoint num="6" id="579" />
+<TGConnectingPoint num="7" id="580" />
+<TGConnectingPoint num="8" id="581" />
+<TGConnectingPoint num="9" id="582" />
+<TGConnectingPoint num="10" id="583" />
+<TGConnectingPoint num="11" id="584" />
+<TGConnectingPoint num="12" id="585" />
+<TGConnectingPoint num="13" id="586" />
+<TGConnectingPoint num="14" id="587" />
+<TGConnectingPoint num="15" id="588" />
+<TGConnectingPoint num="16" id="589" />
+<TGConnectingPoint num="17" id="590" />
+<TGConnectingPoint num="18" id="591" />
+<TGConnectingPoint num="19" id="592" />
+<TGConnectingPoint num="20" id="593" />
+<TGConnectingPoint num="21" id="594" />
+<TGConnectingPoint num="22" id="595" />
+<TGConnectingPoint num="23" id="596" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="rightVelocity" value="0" type="8" typeOther="" />
@@ -2436,36 +2499,36 @@ state 2: obstacles in close proximity
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="610" >
+<COMPONENT type="5000" id="622" >
 <cdparam x="169" y="325" />
 <sizeparam width="287" height="202" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block0" value="TemperatureSensor" />
-<TGConnectingPoint num="0" id="586" />
-<TGConnectingPoint num="1" id="587" />
-<TGConnectingPoint num="2" id="588" />
-<TGConnectingPoint num="3" id="589" />
-<TGConnectingPoint num="4" id="590" />
-<TGConnectingPoint num="5" id="591" />
-<TGConnectingPoint num="6" id="592" />
-<TGConnectingPoint num="7" id="593" />
-<TGConnectingPoint num="8" id="594" />
-<TGConnectingPoint num="9" id="595" />
-<TGConnectingPoint num="10" id="596" />
-<TGConnectingPoint num="11" id="597" />
-<TGConnectingPoint num="12" id="598" />
-<TGConnectingPoint num="13" id="599" />
-<TGConnectingPoint num="14" id="600" />
-<TGConnectingPoint num="15" id="601" />
-<TGConnectingPoint num="16" id="602" />
-<TGConnectingPoint num="17" id="603" />
-<TGConnectingPoint num="18" id="604" />
-<TGConnectingPoint num="19" id="605" />
-<TGConnectingPoint num="20" id="606" />
-<TGConnectingPoint num="21" id="607" />
-<TGConnectingPoint num="22" id="608" />
-<TGConnectingPoint num="23" id="609" />
+<TGConnectingPoint num="0" id="598" />
+<TGConnectingPoint num="1" id="599" />
+<TGConnectingPoint num="2" id="600" />
+<TGConnectingPoint num="3" id="601" />
+<TGConnectingPoint num="4" id="602" />
+<TGConnectingPoint num="5" id="603" />
+<TGConnectingPoint num="6" id="604" />
+<TGConnectingPoint num="7" id="605" />
+<TGConnectingPoint num="8" id="606" />
+<TGConnectingPoint num="9" id="607" />
+<TGConnectingPoint num="10" id="608" />
+<TGConnectingPoint num="11" id="609" />
+<TGConnectingPoint num="12" id="610" />
+<TGConnectingPoint num="13" id="611" />
+<TGConnectingPoint num="14" id="612" />
+<TGConnectingPoint num="15" id="613" />
+<TGConnectingPoint num="16" id="614" />
+<TGConnectingPoint num="17" id="615" />
+<TGConnectingPoint num="18" id="616" />
+<TGConnectingPoint num="19" id="617" />
+<TGConnectingPoint num="20" id="618" />
+<TGConnectingPoint num="21" id="619" />
+<TGConnectingPoint num="22" id="620" />
+<TGConnectingPoint num="23" id="621" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="sensorOn" value="false" type="4" typeOther="" />
@@ -2476,36 +2539,36 @@ state 2: obstacles in close proximity
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="635" >
+<COMPONENT type="5000" id="647" >
 <cdparam x="169" y="538" />
 <sizeparam width="292" height="178" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block0" value="DistanceSensor" />
-<TGConnectingPoint num="0" id="611" />
-<TGConnectingPoint num="1" id="612" />
-<TGConnectingPoint num="2" id="613" />
-<TGConnectingPoint num="3" id="614" />
-<TGConnectingPoint num="4" id="615" />
-<TGConnectingPoint num="5" id="616" />
-<TGConnectingPoint num="6" id="617" />
-<TGConnectingPoint num="7" id="618" />
-<TGConnectingPoint num="8" id="619" />
-<TGConnectingPoint num="9" id="620" />
-<TGConnectingPoint num="10" id="621" />
-<TGConnectingPoint num="11" id="622" />
-<TGConnectingPoint num="12" id="623" />
-<TGConnectingPoint num="13" id="624" />
-<TGConnectingPoint num="14" id="625" />
-<TGConnectingPoint num="15" id="626" />
-<TGConnectingPoint num="16" id="627" />
-<TGConnectingPoint num="17" id="628" />
-<TGConnectingPoint num="18" id="629" />
-<TGConnectingPoint num="19" id="630" />
-<TGConnectingPoint num="20" id="631" />
-<TGConnectingPoint num="21" id="632" />
-<TGConnectingPoint num="22" id="633" />
-<TGConnectingPoint num="23" id="634" />
+<TGConnectingPoint num="0" id="623" />
+<TGConnectingPoint num="1" id="624" />
+<TGConnectingPoint num="2" id="625" />
+<TGConnectingPoint num="3" id="626" />
+<TGConnectingPoint num="4" id="627" />
+<TGConnectingPoint num="5" id="628" />
+<TGConnectingPoint num="6" id="629" />
+<TGConnectingPoint num="7" id="630" />
+<TGConnectingPoint num="8" id="631" />
+<TGConnectingPoint num="9" id="632" />
+<TGConnectingPoint num="10" id="633" />
+<TGConnectingPoint num="11" id="634" />
+<TGConnectingPoint num="12" id="635" />
+<TGConnectingPoint num="13" id="636" />
+<TGConnectingPoint num="14" id="637" />
+<TGConnectingPoint num="15" id="638" />
+<TGConnectingPoint num="16" id="639" />
+<TGConnectingPoint num="17" id="640" />
+<TGConnectingPoint num="18" id="641" />
+<TGConnectingPoint num="19" id="642" />
+<TGConnectingPoint num="20" id="643" />
+<TGConnectingPoint num="21" id="644" />
+<TGConnectingPoint num="22" id="645" />
+<TGConnectingPoint num="23" id="646" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="samplingRate" value="10" type="8" typeOther="" />
@@ -2518,36 +2581,36 @@ state 2: obstacles in close proximity
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="660" >
+<COMPONENT type="5000" id="672" >
 <cdparam x="514" y="324" />
 <sizeparam width="436" height="393" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Block0" value="MainControl" />
-<TGConnectingPoint num="0" id="636" />
-<TGConnectingPoint num="1" id="637" />
-<TGConnectingPoint num="2" id="638" />
-<TGConnectingPoint num="3" id="639" />
-<TGConnectingPoint num="4" id="640" />
-<TGConnectingPoint num="5" id="641" />
-<TGConnectingPoint num="6" id="642" />
-<TGConnectingPoint num="7" id="643" />
-<TGConnectingPoint num="8" id="644" />
-<TGConnectingPoint num="9" id="645" />
-<TGConnectingPoint num="10" id="646" />
-<TGConnectingPoint num="11" id="647" />
-<TGConnectingPoint num="12" id="648" />
-<TGConnectingPoint num="13" id="649" />
-<TGConnectingPoint num="14" id="650" />
-<TGConnectingPoint num="15" id="651" />
-<TGConnectingPoint num="16" id="652" />
-<TGConnectingPoint num="17" id="653" />
-<TGConnectingPoint num="18" id="654" />
-<TGConnectingPoint num="19" id="655" />
-<TGConnectingPoint num="20" id="656" />
-<TGConnectingPoint num="21" id="657" />
-<TGConnectingPoint num="22" id="658" />
-<TGConnectingPoint num="23" id="659" />
+<TGConnectingPoint num="0" id="648" />
+<TGConnectingPoint num="1" id="649" />
+<TGConnectingPoint num="2" id="650" />
+<TGConnectingPoint num="3" id="651" />
+<TGConnectingPoint num="4" id="652" />
+<TGConnectingPoint num="5" id="653" />
+<TGConnectingPoint num="6" id="654" />
+<TGConnectingPoint num="7" id="655" />
+<TGConnectingPoint num="8" id="656" />
+<TGConnectingPoint num="9" id="657" />
+<TGConnectingPoint num="10" id="658" />
+<TGConnectingPoint num="11" id="659" />
+<TGConnectingPoint num="12" id="660" />
+<TGConnectingPoint num="13" id="661" />
+<TGConnectingPoint num="14" id="662" />
+<TGConnectingPoint num="15" id="663" />
+<TGConnectingPoint num="16" id="664" />
+<TGConnectingPoint num="17" id="665" />
+<TGConnectingPoint num="18" id="666" />
+<TGConnectingPoint num="19" id="667" />
+<TGConnectingPoint num="20" id="668" />
+<TGConnectingPoint num="21" id="669" />
+<TGConnectingPoint num="22" id="670" />
+<TGConnectingPoint num="23" id="671" />
 <extraparam>
 <CryptoBlock value="false" />
 <Attribute access="0" id="state" value="0" type="8" typeOther="" />
@@ -2577,55 +2640,55 @@ state 2: obstacles in close proximity
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MotorControl" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="673" >
+<CONNECTOR type="5102" id="685" >
 <cdparam x="407" y="201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="669" />
-<TGConnectingPoint num="1" id="670" />
-<TGConnectingPoint num="2" id="671" />
-<TGConnectingPoint num="3" id="672" />
-<P1  x="407" y="201" id="689" />
-<P2  x="495" y="113" id="703" />
+<TGConnectingPoint num="0" id="681" />
+<TGConnectingPoint num="1" id="682" />
+<TGConnectingPoint num="2" id="683" />
+<TGConnectingPoint num="3" id="684" />
+<P1  x="407" y="201" id="701" />
+<P2  x="495" y="113" id="715" />
 <Point x="407" y="234" />
 <Point x="601" y="231" />
 <Point x="599" y="112" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="661" >
-<father id="673" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="673" >
+<father id="685" num="0" />
 <cdparam x="407" y="234" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="662" >
-<father id="673" num="1" />
+<SUBCOMPONENT type="-1" id="674" >
+<father id="685" num="1" />
 <cdparam x="601" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="663" >
-<father id="673" num="2" />
+<SUBCOMPONENT type="-1" id="675" >
+<father id="685" num="2" />
 <cdparam x="599" y="112" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="668" >
-<father id="673" num="3" />
+<SUBCOMPONENT type="-1" id="680" >
+<father id="685" num="3" />
 <cdparam x="451" y="157" />
 <sizeparam width="80" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="664" />
-<TGConnectingPoint num="1" id="665" />
-<TGConnectingPoint num="2" id="666" />
-<TGConnectingPoint num="3" id="667" />
+<TGConnectingPoint num="0" id="676" />
+<TGConnectingPoint num="1" id="677" />
+<TGConnectingPoint num="2" id="678" />
+<TGConnectingPoint num="3" id="679" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="10" />
@@ -2635,25 +2698,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="680" >
+<CONNECTOR type="5102" id="692" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="679" />
-<P1  x="407" y="60" id="740" />
-<P2  x="407" y="88" id="700" />
+<TGConnectingPoint num="0" id="691" />
+<P1  x="407" y="60" id="752" />
+<P2  x="407" y="88" id="712" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="678" >
-<father id="680" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="690" >
+<father id="692" num="0" />
 <cdparam x="447" y="100" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="674" />
-<TGConnectingPoint num="1" id="675" />
-<TGConnectingPoint num="2" id="676" />
-<TGConnectingPoint num="3" id="677" />
+<TGConnectingPoint num="0" id="686" />
+<TGConnectingPoint num="1" id="687" />
+<TGConnectingPoint num="2" id="688" />
+<TGConnectingPoint num="3" id="689" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2663,25 +2726,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="687" >
+<CONNECTOR type="5102" id="699" >
 <cdparam x="536" y="590" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="686" />
-<P1  x="407" y="138" id="705" />
-<P2  x="407" y="171" id="688" />
+<TGConnectingPoint num="0" id="698" />
+<P1  x="407" y="138" id="717" />
+<P2  x="407" y="171" id="700" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="685" >
-<father id="687" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="697" >
+<father id="699" num="0" />
 <cdparam x="425" y="612" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="681" />
-<TGConnectingPoint num="1" id="682" />
-<TGConnectingPoint num="2" id="683" />
-<TGConnectingPoint num="3" id="684" />
+<TGConnectingPoint num="0" id="693" />
+<TGConnectingPoint num="1" id="694" />
+<TGConnectingPoint num="2" id="695" />
+<TGConnectingPoint num="3" id="696" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2691,126 +2754,126 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5104" id="698" >
+<COMPONENT type="5104" id="710" >
 <cdparam x="267" y="176" />
 <sizeparam width="280" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="motorCommand(leftVelocity, rightVelocity)" />
-<TGConnectingPoint num="0" id="688" />
-<TGConnectingPoint num="1" id="689" />
-<TGConnectingPoint num="2" id="690" />
-<TGConnectingPoint num="3" id="691" />
-<TGConnectingPoint num="4" id="692" />
-<TGConnectingPoint num="5" id="693" />
-<TGConnectingPoint num="6" id="694" />
-<TGConnectingPoint num="7" id="695" />
-<TGConnectingPoint num="8" id="696" />
-<TGConnectingPoint num="9" id="697" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="739" >
+<TGConnectingPoint num="0" id="700" />
+<TGConnectingPoint num="1" id="701" />
+<TGConnectingPoint num="2" id="702" />
+<TGConnectingPoint num="3" id="703" />
+<TGConnectingPoint num="4" id="704" />
+<TGConnectingPoint num="5" id="705" />
+<TGConnectingPoint num="6" id="706" />
+<TGConnectingPoint num="7" id="707" />
+<TGConnectingPoint num="8" id="708" />
+<TGConnectingPoint num="9" id="709" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="751" >
 <cdparam x="319" y="88" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="startMotor" />
-<TGConnectingPoint num="0" id="699" />
-<TGConnectingPoint num="1" id="700" />
-<TGConnectingPoint num="2" id="701" />
-<TGConnectingPoint num="3" id="702" />
-<TGConnectingPoint num="4" id="703" />
-<TGConnectingPoint num="5" id="704" />
-<TGConnectingPoint num="6" id="705" />
-<TGConnectingPoint num="7" id="706" />
-<TGConnectingPoint num="8" id="707" />
-<TGConnectingPoint num="9" id="708" />
-<TGConnectingPoint num="10" id="709" />
-<TGConnectingPoint num="11" id="710" />
-<TGConnectingPoint num="12" id="711" />
-<TGConnectingPoint num="13" id="712" />
-<TGConnectingPoint num="14" id="713" />
-<TGConnectingPoint num="15" id="714" />
-<TGConnectingPoint num="16" id="715" />
-<TGConnectingPoint num="17" id="716" />
-<TGConnectingPoint num="18" id="717" />
-<TGConnectingPoint num="19" id="718" />
-<TGConnectingPoint num="20" id="719" />
-<TGConnectingPoint num="21" id="720" />
-<TGConnectingPoint num="22" id="721" />
-<TGConnectingPoint num="23" id="722" />
-<TGConnectingPoint num="24" id="723" />
-<TGConnectingPoint num="25" id="724" />
-<TGConnectingPoint num="26" id="725" />
-<TGConnectingPoint num="27" id="726" />
-<TGConnectingPoint num="28" id="727" />
-<TGConnectingPoint num="29" id="728" />
-<TGConnectingPoint num="30" id="729" />
-<TGConnectingPoint num="31" id="730" />
-<TGConnectingPoint num="32" id="731" />
-<TGConnectingPoint num="33" id="732" />
-<TGConnectingPoint num="34" id="733" />
-<TGConnectingPoint num="35" id="734" />
-<TGConnectingPoint num="36" id="735" />
-<TGConnectingPoint num="37" id="736" />
-<TGConnectingPoint num="38" id="737" />
-<TGConnectingPoint num="39" id="738" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="741" >
+<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" />
+<TGConnectingPoint num="16" id="727" />
+<TGConnectingPoint num="17" id="728" />
+<TGConnectingPoint num="18" id="729" />
+<TGConnectingPoint num="19" id="730" />
+<TGConnectingPoint num="20" id="731" />
+<TGConnectingPoint num="21" id="732" />
+<TGConnectingPoint num="22" id="733" />
+<TGConnectingPoint num="23" id="734" />
+<TGConnectingPoint num="24" id="735" />
+<TGConnectingPoint num="25" id="736" />
+<TGConnectingPoint num="26" id="737" />
+<TGConnectingPoint num="27" id="738" />
+<TGConnectingPoint num="28" id="739" />
+<TGConnectingPoint num="29" id="740" />
+<TGConnectingPoint num="30" id="741" />
+<TGConnectingPoint num="31" id="742" />
+<TGConnectingPoint num="32" id="743" />
+<TGConnectingPoint num="33" id="744" />
+<TGConnectingPoint num="34" id="745" />
+<TGConnectingPoint num="35" id="746" />
+<TGConnectingPoint num="36" id="747" />
+<TGConnectingPoint num="37" id="748" />
+<TGConnectingPoint num="38" id="749" />
+<TGConnectingPoint num="39" id="750" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="753" >
 <cdparam x="400" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="740" />
+<TGConnectingPoint num="0" id="752" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="TemperatureSensor" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="752" >
+<CONNECTOR type="5102" id="764" >
 <cdparam x="332" y="571" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="749" />
-<TGConnectingPoint num="1" id="750" />
-<TGConnectingPoint num="2" id="751" />
-<P1  x="405" y="357" id="807" />
-<P2  x="495" y="146" id="843" />
+<TGConnectingPoint num="0" id="761" />
+<TGConnectingPoint num="1" id="762" />
+<TGConnectingPoint num="2" id="763" />
+<P1  x="405" y="357" id="819" />
+<P2  x="495" y="146" id="855" />
 <Point x="648" y="358" />
 <Point x="652" y="146" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="742" >
-<father id="752" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="754" >
+<father id="764" num="0" />
 <cdparam x="648" y="358" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="743" >
-<father id="752" num="1" />
+<SUBCOMPONENT type="-1" id="755" >
+<father id="764" num="1" />
 <cdparam x="652" y="146" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="748" >
-<father id="752" num="2" />
+<SUBCOMPONENT type="-1" id="760" >
+<father id="764" num="2" />
 <cdparam x="413" y="358" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="744" />
-<TGConnectingPoint num="1" id="745" />
-<TGConnectingPoint num="2" id="746" />
-<TGConnectingPoint num="3" id="747" />
+<TGConnectingPoint num="0" id="756" />
+<TGConnectingPoint num="1" id="757" />
+<TGConnectingPoint num="2" id="758" />
+<TGConnectingPoint num="3" id="759" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2820,45 +2883,45 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="763" >
+<CONNECTOR type="5102" id="775" >
 <cdparam x="325" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="760" />
-<TGConnectingPoint num="1" id="761" />
-<TGConnectingPoint num="2" id="762" />
-<P1  x="298" y="255" id="796" />
-<P2  x="319" y="152" id="829" />
+<TGConnectingPoint num="0" id="772" />
+<TGConnectingPoint num="1" id="773" />
+<TGConnectingPoint num="2" id="774" />
+<P1  x="298" y="255" id="808" />
+<P2  x="319" y="152" id="841" />
 <Point x="190" y="255" />
 <Point x="189" y="151" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="753" >
-<father id="763" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="765" >
+<father id="775" num="0" />
 <cdparam x="190" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="754" >
-<father id="763" num="1" />
+<SUBCOMPONENT type="-1" id="766" >
+<father id="775" num="1" />
 <cdparam x="189" y="151" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="759" >
-<father id="763" num="2" />
+<SUBCOMPONENT type="-1" id="771" >
+<father id="775" num="2" />
 <cdparam x="322" y="203" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="755" />
-<TGConnectingPoint num="1" id="756" />
-<TGConnectingPoint num="2" id="757" />
-<TGConnectingPoint num="3" id="758" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2868,25 +2931,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="770" >
+<CONNECTOR type="5102" id="782" >
 <cdparam x="362" y="290" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="769" />
-<P1  x="407" y="165" id="823" />
-<P2  x="407" y="276" id="792" />
+<TGConnectingPoint num="0" id="781" />
+<P1  x="407" y="165" id="835" />
+<P2  x="407" y="276" id="804" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="768" >
-<father id="770" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="780" >
+<father id="782" num="0" />
 <cdparam x="419" y="226" />
-<sizeparam width="217" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="218" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="764" />
-<TGConnectingPoint num="1" id="765" />
-<TGConnectingPoint num="2" id="766" />
-<TGConnectingPoint num="3" id="767" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
 <extraparam>
 <guard value="[ sensorOn]" />
 <afterMin value="samplingRate" />
@@ -2896,25 +2959,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="777" >
+<CONNECTOR type="5102" id="789" >
 <cdparam x="538" y="298" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="776" />
-<P1  x="407" y="306" id="793" />
-<P2  x="405" y="327" id="806" />
+<TGConnectingPoint num="0" id="788" />
+<P1  x="407" y="306" id="805" />
+<P2  x="405" y="327" id="818" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="775" >
-<father id="777" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="787" >
+<father id="789" num="0" />
 <cdparam x="471" y="312" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="771" />
-<TGConnectingPoint num="1" id="772" />
-<TGConnectingPoint num="2" id="773" />
-<TGConnectingPoint num="3" id="774" />
+<TGConnectingPoint num="0" id="783" />
+<TGConnectingPoint num="1" id="784" />
+<TGConnectingPoint num="2" id="785" />
+<TGConnectingPoint num="3" id="786" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2924,25 +2987,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="784" >
+<CONNECTOR type="5102" id="796" >
 <cdparam x="363" y="165" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="783" />
-<P1  x="363" y="165" id="831" />
-<P2  x="298" y="225" id="795" />
+<TGConnectingPoint num="0" id="795" />
+<P1  x="363" y="165" id="843" />
+<P2  x="298" y="225" id="807" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="782" >
-<father id="784" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="794" >
+<father id="796" num="0" />
 <cdparam x="476" y="301" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="778" />
-<TGConnectingPoint num="1" id="779" />
-<TGConnectingPoint num="2" id="780" />
-<TGConnectingPoint num="3" id="781" />
+<TGConnectingPoint num="0" id="790" />
+<TGConnectingPoint num="1" id="791" />
+<TGConnectingPoint num="2" id="792" />
+<TGConnectingPoint num="3" id="793" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2952,25 +3015,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="791" >
+<CONNECTOR type="5102" id="803" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="790" />
-<P1  x="407" y="60" id="858" />
-<P2  x="407" y="115" id="818" />
+<TGConnectingPoint num="0" id="802" />
+<P1  x="407" y="60" id="870" />
+<P2  x="407" y="115" id="830" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="789" >
-<father id="791" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="801" >
+<father id="803" num="0" />
 <cdparam x="447" y="100" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="785" />
-<TGConnectingPoint num="1" id="786" />
-<TGConnectingPoint num="2" id="787" />
-<TGConnectingPoint num="3" id="788" />
+<TGConnectingPoint num="0" id="797" />
+<TGConnectingPoint num="1" id="798" />
+<TGConnectingPoint num="2" id="799" />
+<TGConnectingPoint num="3" id="800" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2980,137 +3043,137 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5108" id="794" >
+<COMPONENT type="5108" id="806" >
 <cdparam x="326" y="281" />
 <sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="792" />
-<TGConnectingPoint num="1" id="793" />
+<TGConnectingPoint num="0" id="804" />
+<TGConnectingPoint num="1" id="805" />
 <extraparam>
 <Data variable="temp" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="805" >
-<cdparam x="234" y="230" />
-<sizeparam width="129" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="817" >
+<cdparam x="232" y="230" />
+<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="control(sensorOn)" />
-<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" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="816" >
+<TGConnectingPoint num="0" id="807" />
+<TGConnectingPoint num="1" id="808" />
+<TGConnectingPoint num="2" id="809" />
+<TGConnectingPoint num="3" id="810" />
+<TGConnectingPoint num="4" id="811" />
+<TGConnectingPoint num="5" id="812" />
+<TGConnectingPoint num="6" id="813" />
+<TGConnectingPoint num="7" id="814" />
+<TGConnectingPoint num="8" id="815" />
+<TGConnectingPoint num="9" id="816" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="828" >
 <cdparam x="348" y="332" />
 <sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="tempData(temp)" />
-<TGConnectingPoint num="0" id="806" />
-<TGConnectingPoint num="1" id="807" />
-<TGConnectingPoint num="2" id="808" />
-<TGConnectingPoint num="3" id="809" />
-<TGConnectingPoint num="4" id="810" />
-<TGConnectingPoint num="5" id="811" />
-<TGConnectingPoint num="6" id="812" />
-<TGConnectingPoint num="7" id="813" />
-<TGConnectingPoint num="8" id="814" />
-<TGConnectingPoint num="9" id="815" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="857" >
+<TGConnectingPoint num="0" id="818" />
+<TGConnectingPoint num="1" id="819" />
+<TGConnectingPoint num="2" id="820" />
+<TGConnectingPoint num="3" id="821" />
+<TGConnectingPoint num="4" id="822" />
+<TGConnectingPoint num="5" id="823" />
+<TGConnectingPoint num="6" id="824" />
+<TGConnectingPoint num="7" id="825" />
+<TGConnectingPoint num="8" id="826" />
+<TGConnectingPoint num="9" id="827" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="869" >
 <cdparam x="319" y="115" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="start" />
-<TGConnectingPoint num="0" id="817" />
-<TGConnectingPoint num="1" id="818" />
-<TGConnectingPoint num="2" id="819" />
-<TGConnectingPoint num="3" id="820" />
-<TGConnectingPoint num="4" id="821" />
-<TGConnectingPoint num="5" id="822" />
-<TGConnectingPoint num="6" id="823" />
-<TGConnectingPoint num="7" id="824" />
-<TGConnectingPoint num="8" id="825" />
-<TGConnectingPoint num="9" id="826" />
-<TGConnectingPoint num="10" id="827" />
-<TGConnectingPoint num="11" id="828" />
-<TGConnectingPoint num="12" id="829" />
-<TGConnectingPoint num="13" id="830" />
-<TGConnectingPoint num="14" id="831" />
-<TGConnectingPoint num="15" id="832" />
-<TGConnectingPoint num="16" id="833" />
-<TGConnectingPoint num="17" id="834" />
-<TGConnectingPoint num="18" id="835" />
-<TGConnectingPoint num="19" id="836" />
-<TGConnectingPoint num="20" id="837" />
-<TGConnectingPoint num="21" id="838" />
-<TGConnectingPoint num="22" id="839" />
-<TGConnectingPoint num="23" id="840" />
-<TGConnectingPoint num="24" id="841" />
-<TGConnectingPoint num="25" id="842" />
-<TGConnectingPoint num="26" id="843" />
-<TGConnectingPoint num="27" id="844" />
-<TGConnectingPoint num="28" id="845" />
-<TGConnectingPoint num="29" id="846" />
-<TGConnectingPoint num="30" id="847" />
-<TGConnectingPoint num="31" id="848" />
-<TGConnectingPoint num="32" id="849" />
-<TGConnectingPoint num="33" id="850" />
-<TGConnectingPoint num="34" id="851" />
-<TGConnectingPoint num="35" id="852" />
-<TGConnectingPoint num="36" id="853" />
-<TGConnectingPoint num="37" id="854" />
-<TGConnectingPoint num="38" id="855" />
-<TGConnectingPoint num="39" id="856" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="859" >
+<TGConnectingPoint num="0" id="829" />
+<TGConnectingPoint num="1" id="830" />
+<TGConnectingPoint num="2" id="831" />
+<TGConnectingPoint num="3" id="832" />
+<TGConnectingPoint num="4" id="833" />
+<TGConnectingPoint num="5" id="834" />
+<TGConnectingPoint num="6" id="835" />
+<TGConnectingPoint num="7" id="836" />
+<TGConnectingPoint num="8" id="837" />
+<TGConnectingPoint num="9" id="838" />
+<TGConnectingPoint num="10" id="839" />
+<TGConnectingPoint num="11" id="840" />
+<TGConnectingPoint num="12" id="841" />
+<TGConnectingPoint num="13" id="842" />
+<TGConnectingPoint num="14" id="843" />
+<TGConnectingPoint num="15" id="844" />
+<TGConnectingPoint num="16" id="845" />
+<TGConnectingPoint num="17" id="846" />
+<TGConnectingPoint num="18" id="847" />
+<TGConnectingPoint num="19" id="848" />
+<TGConnectingPoint num="20" id="849" />
+<TGConnectingPoint num="21" id="850" />
+<TGConnectingPoint num="22" id="851" />
+<TGConnectingPoint num="23" id="852" />
+<TGConnectingPoint num="24" id="853" />
+<TGConnectingPoint num="25" id="854" />
+<TGConnectingPoint num="26" id="855" />
+<TGConnectingPoint num="27" id="856" />
+<TGConnectingPoint num="28" id="857" />
+<TGConnectingPoint num="29" id="858" />
+<TGConnectingPoint num="30" id="859" />
+<TGConnectingPoint num="31" id="860" />
+<TGConnectingPoint num="32" id="861" />
+<TGConnectingPoint num="33" id="862" />
+<TGConnectingPoint num="34" id="863" />
+<TGConnectingPoint num="35" id="864" />
+<TGConnectingPoint num="36" id="865" />
+<TGConnectingPoint num="37" id="866" />
+<TGConnectingPoint num="38" id="867" />
+<TGConnectingPoint num="39" id="868" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="871" >
 <cdparam x="400" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="858" />
+<TGConnectingPoint num="0" id="870" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="DistanceSensor" minX="10" maxX="2500" minY="10" maxY="1500" >
-<CONNECTOR type="5102" id="866" >
+<CONNECTOR type="5102" id="878" >
 <cdparam x="331" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="865" />
-<P1  x="331" y="153" id="978" />
-<P2  x="287" y="287" id="999" />
+<TGConnectingPoint num="0" id="877" />
+<P1  x="331" y="153" id="990" />
+<P2  x="287" y="287" id="1011" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="864" >
-<father id="866" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="876" >
+<father id="878" num="0" />
 <cdparam x="144" y="204" />
-<sizeparam width="217" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="218" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="860" />
-<TGConnectingPoint num="1" id="861" />
-<TGConnectingPoint num="2" id="862" />
-<TGConnectingPoint num="3" id="863" />
+<TGConnectingPoint num="0" id="872" />
+<TGConnectingPoint num="1" id="873" />
+<TGConnectingPoint num="2" id="874" />
+<TGConnectingPoint num="3" id="875" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="samplingRate" />
@@ -3120,25 +3183,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="873" >
+<CONNECTOR type="5102" id="885" >
 <cdparam x="287" y="454" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="872" />
-<P1  x="287" y="454" id="994" />
-<P2  x="287" y="522" id="928" />
+<TGConnectingPoint num="0" id="884" />
+<P1  x="287" y="454" id="1006" />
+<P2  x="287" y="493" id="940" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="871" >
-<father id="873" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="883" >
+<father id="885" num="0" />
 <cdparam x="302" y="488" />
-<sizeparam width="61" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="64" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="867" />
-<TGConnectingPoint num="1" id="868" />
-<TGConnectingPoint num="2" id="869" />
-<TGConnectingPoint num="3" id="870" />
+<TGConnectingPoint num="0" id="879" />
+<TGConnectingPoint num="1" id="880" />
+<TGConnectingPoint num="2" id="881" />
+<TGConnectingPoint num="3" id="882" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="1" />
@@ -3148,25 +3211,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="880" >
+<CONNECTOR type="5102" id="892" >
 <cdparam x="287" y="380" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="879" />
-<P1  x="287" y="380" id="997" />
-<P2  x="287" y="424" id="993" />
+<TGConnectingPoint num="0" id="891" />
+<P1  x="287" y="380" id="1009" />
+<P2  x="287" y="424" id="1005" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="878" >
-<father id="880" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="890" >
+<father id="892" num="0" />
 <cdparam x="298" y="399" />
-<sizeparam width="61" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="64" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="874" />
-<TGConnectingPoint num="1" id="875" />
-<TGConnectingPoint num="2" id="876" />
-<TGConnectingPoint num="3" id="877" />
+<TGConnectingPoint num="0" id="886" />
+<TGConnectingPoint num="1" id="887" />
+<TGConnectingPoint num="2" id="888" />
+<TGConnectingPoint num="3" id="889" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="1" />
@@ -3176,25 +3239,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="887" >
+<CONNECTOR type="5102" id="899" >
 <cdparam x="287" y="317" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="886" />
-<P1  x="287" y="317" id="1000" />
-<P2  x="287" y="350" id="996" />
+<TGConnectingPoint num="0" id="898" />
+<P1  x="287" y="317" id="1012" />
+<P2  x="287" y="350" id="1008" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="885" >
-<father id="887" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="897" >
+<father id="899" num="0" />
 <cdparam x="293" y="330" />
-<sizeparam width="61" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="64" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="881" />
-<TGConnectingPoint num="1" id="882" />
-<TGConnectingPoint num="2" id="883" />
-<TGConnectingPoint num="3" id="884" />
+<TGConnectingPoint num="0" id="893" />
+<TGConnectingPoint num="1" id="894" />
+<TGConnectingPoint num="2" id="895" />
+<TGConnectingPoint num="3" id="896" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="1" />
@@ -3204,55 +3267,55 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="900" >
+<CONNECTOR type="5102" id="912" >
 <cdparam x="523" y="226" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="896" />
-<TGConnectingPoint num="1" id="897" />
-<TGConnectingPoint num="2" id="898" />
-<TGConnectingPoint num="3" id="899" />
-<P1  x="523" y="226" id="940" />
-<P2  x="506" y="128" id="954" />
+<TGConnectingPoint num="0" id="908" />
+<TGConnectingPoint num="1" id="909" />
+<TGConnectingPoint num="2" id="910" />
+<TGConnectingPoint num="3" id="911" />
+<P1  x="523" y="226" id="952" />
+<P2  x="506" y="128" id="966" />
 <Point x="523" y="255" />
 <Point x="674" y="255" />
 <Point x="676" y="130" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="888" >
-<father id="900" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="900" >
+<father id="912" num="0" />
 <cdparam x="523" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="889" >
-<father id="900" num="1" />
+<SUBCOMPONENT type="-1" id="901" >
+<father id="912" num="1" />
 <cdparam x="674" y="255" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="890" >
-<father id="900" num="2" />
+<SUBCOMPONENT type="-1" id="902" >
+<father id="912" num="2" />
 <cdparam x="676" y="130" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="895" >
-<father id="900" num="3" />
+<SUBCOMPONENT type="-1" id="907" >
+<father id="912" num="3" />
 <cdparam x="514" y="177" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="891" />
-<TGConnectingPoint num="1" id="892" />
-<TGConnectingPoint num="2" id="893" />
-<TGConnectingPoint num="3" id="894" />
+<TGConnectingPoint num="0" id="903" />
+<TGConnectingPoint num="1" id="904" />
+<TGConnectingPoint num="2" id="905" />
+<TGConnectingPoint num="3" id="906" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3262,55 +3325,55 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="913" >
+<CONNECTOR type="5102" id="925" >
 <cdparam x="262" y="358" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="909" />
-<TGConnectingPoint num="1" id="910" />
-<TGConnectingPoint num="2" id="911" />
-<TGConnectingPoint num="3" id="912" />
-<P1  x="287" y="552" id="929" />
-<P2  x="308" y="134" id="974" />
-<Point x="287" y="568" />
-<Point x="71" y="568" />
+<TGConnectingPoint num="0" id="921" />
+<TGConnectingPoint num="1" id="922" />
+<TGConnectingPoint num="2" id="923" />
+<TGConnectingPoint num="3" id="924" />
+<P1  x="287" y="523" id="941" />
+<P2  x="308" y="134" id="986" />
+<Point x="287" y="538" />
+<Point x="71" y="538" />
 <Point x="71" y="133" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="901" >
-<father id="913" num="0" />
-<cdparam x="287" y="568" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="913" >
+<father id="925" num="0" />
+<cdparam x="287" y="538" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="902" >
-<father id="913" num="1" />
-<cdparam x="71" y="568" />
+<SUBCOMPONENT type="-1" id="914" >
+<father id="925" num="1" />
+<cdparam x="71" y="538" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="903" >
-<father id="913" num="2" />
+<SUBCOMPONENT type="-1" id="915" >
+<father id="925" num="2" />
 <cdparam x="71" y="133" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="908" >
-<father id="913" num="3" />
+<SUBCOMPONENT type="-1" id="920" >
+<father id="925" num="3" />
 <cdparam x="285" y="246" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="904" />
-<TGConnectingPoint num="1" id="905" />
-<TGConnectingPoint num="2" id="906" />
-<TGConnectingPoint num="3" id="907" />
+<TGConnectingPoint num="0" id="916" />
+<TGConnectingPoint num="1" id="917" />
+<TGConnectingPoint num="2" id="918" />
+<TGConnectingPoint num="3" id="919" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3320,25 +3383,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="920" >
+<CONNECTOR type="5102" id="932" >
 <cdparam x="407" y="60" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="919" />
-<P1  x="407" y="60" id="991" />
-<P2  x="407" y="103" id="951" />
+<TGConnectingPoint num="0" id="931" />
+<P1  x="407" y="60" id="1003" />
+<P2  x="407" y="103" id="963" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="918" >
-<father id="920" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="930" >
+<father id="932" num="0" />
 <cdparam x="453" y="100" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="914" />
-<TGConnectingPoint num="1" id="915" />
-<TGConnectingPoint num="2" id="916" />
-<TGConnectingPoint num="3" id="917" />
+<TGConnectingPoint num="0" id="926" />
+<TGConnectingPoint num="1" id="927" />
+<TGConnectingPoint num="2" id="928" />
+<TGConnectingPoint num="3" id="929" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3348,25 +3411,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="927" >
+<CONNECTOR type="5102" id="939" >
 <cdparam x="480" y="153" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="926" />
-<P1  x="480" y="153" id="981" />
-<P2  x="523" y="196" id="939" />
+<TGConnectingPoint num="0" id="938" />
+<P1  x="480" y="153" id="993" />
+<P2  x="523" y="196" id="951" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="925" >
-<father id="927" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="937" >
+<father id="939" num="0" />
 <cdparam x="480" y="172" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="921" />
-<TGConnectingPoint num="1" id="922" />
-<TGConnectingPoint num="2" id="923" />
-<TGConnectingPoint num="3" id="924" />
+<TGConnectingPoint num="0" id="933" />
+<TGConnectingPoint num="1" id="934" />
+<TGConnectingPoint num="2" id="935" />
+<TGConnectingPoint num="3" id="936" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3376,135 +3439,137 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5103" id="938" >
-<cdparam x="111" y="527" />
-<sizeparam width="352" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="950" >
+<cdparam x="108" y="498" />
+<sizeparam width="359" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Send signal" value="sensorData(distanceLeft, distanceFront, distanceRight)" />
-<TGConnectingPoint num="0" id="928" />
-<TGConnectingPoint num="1" id="929" />
-<TGConnectingPoint num="2" id="930" />
-<TGConnectingPoint num="3" id="931" />
-<TGConnectingPoint num="4" id="932" />
-<TGConnectingPoint num="5" id="933" />
-<TGConnectingPoint num="6" id="934" />
-<TGConnectingPoint num="7" id="935" />
-<TGConnectingPoint num="8" id="936" />
-<TGConnectingPoint num="9" id="937" />
+<TGConnectingPoint num="0" id="940" />
+<TGConnectingPoint num="1" id="941" />
+<TGConnectingPoint num="2" id="942" />
+<TGConnectingPoint num="3" id="943" />
+<TGConnectingPoint num="4" id="944" />
+<TGConnectingPoint num="5" id="945" />
+<TGConnectingPoint num="6" id="946" />
+<TGConnectingPoint num="7" id="947" />
+<TGConnectingPoint num="8" id="948" />
+<TGConnectingPoint num="9" id="949" />
+<latencyCheck />
 </COMPONENT>
 
-<COMPONENT type="5104" id="949" >
-<cdparam x="430" y="201" />
-<sizeparam width="187" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="961" >
+<cdparam x="429" y="201" />
+<sizeparam width="189" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Receive signal" value="changeRate(samplingRate)" />
-<TGConnectingPoint num="0" id="939" />
-<TGConnectingPoint num="1" id="940" />
-<TGConnectingPoint num="2" id="941" />
-<TGConnectingPoint num="3" id="942" />
-<TGConnectingPoint num="4" id="943" />
-<TGConnectingPoint num="5" id="944" />
-<TGConnectingPoint num="6" id="945" />
-<TGConnectingPoint num="7" id="946" />
-<TGConnectingPoint num="8" id="947" />
-<TGConnectingPoint num="9" id="948" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="990" >
+<TGConnectingPoint num="0" id="951" />
+<TGConnectingPoint num="1" id="952" />
+<TGConnectingPoint num="2" id="953" />
+<TGConnectingPoint num="3" id="954" />
+<TGConnectingPoint num="4" id="955" />
+<TGConnectingPoint num="5" id="956" />
+<TGConnectingPoint num="6" id="957" />
+<TGConnectingPoint num="7" id="958" />
+<TGConnectingPoint num="8" id="959" />
+<TGConnectingPoint num="9" id="960" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1002" >
 <cdparam x="308" y="103" />
 <sizeparam width="198" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="State" value="startSensor" />
-<TGConnectingPoint num="0" id="950" />
-<TGConnectingPoint num="1" id="951" />
-<TGConnectingPoint num="2" id="952" />
-<TGConnectingPoint num="3" id="953" />
-<TGConnectingPoint num="4" id="954" />
-<TGConnectingPoint num="5" id="955" />
-<TGConnectingPoint num="6" id="956" />
-<TGConnectingPoint num="7" id="957" />
-<TGConnectingPoint num="8" id="958" />
-<TGConnectingPoint num="9" id="959" />
-<TGConnectingPoint num="10" id="960" />
-<TGConnectingPoint num="11" id="961" />
-<TGConnectingPoint num="12" id="962" />
-<TGConnectingPoint num="13" id="963" />
-<TGConnectingPoint num="14" id="964" />
-<TGConnectingPoint num="15" id="965" />
-<TGConnectingPoint num="16" id="966" />
-<TGConnectingPoint num="17" id="967" />
-<TGConnectingPoint num="18" id="968" />
-<TGConnectingPoint num="19" id="969" />
-<TGConnectingPoint num="20" id="970" />
-<TGConnectingPoint num="21" id="971" />
-<TGConnectingPoint num="22" id="972" />
-<TGConnectingPoint num="23" id="973" />
-<TGConnectingPoint num="24" id="974" />
-<TGConnectingPoint num="25" id="975" />
-<TGConnectingPoint num="26" id="976" />
-<TGConnectingPoint num="27" id="977" />
-<TGConnectingPoint num="28" id="978" />
-<TGConnectingPoint num="29" id="979" />
-<TGConnectingPoint num="30" id="980" />
-<TGConnectingPoint num="31" id="981" />
-<TGConnectingPoint num="32" id="982" />
-<TGConnectingPoint num="33" id="983" />
-<TGConnectingPoint num="34" id="984" />
-<TGConnectingPoint num="35" id="985" />
-<TGConnectingPoint num="36" id="986" />
-<TGConnectingPoint num="37" id="987" />
-<TGConnectingPoint num="38" id="988" />
-<TGConnectingPoint num="39" id="989" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="992" >
+<TGConnectingPoint num="0" id="962" />
+<TGConnectingPoint num="1" id="963" />
+<TGConnectingPoint num="2" id="964" />
+<TGConnectingPoint num="3" id="965" />
+<TGConnectingPoint num="4" id="966" />
+<TGConnectingPoint num="5" id="967" />
+<TGConnectingPoint num="6" id="968" />
+<TGConnectingPoint num="7" id="969" />
+<TGConnectingPoint num="8" id="970" />
+<TGConnectingPoint num="9" id="971" />
+<TGConnectingPoint num="10" id="972" />
+<TGConnectingPoint num="11" id="973" />
+<TGConnectingPoint num="12" id="974" />
+<TGConnectingPoint num="13" id="975" />
+<TGConnectingPoint num="14" id="976" />
+<TGConnectingPoint num="15" id="977" />
+<TGConnectingPoint num="16" id="978" />
+<TGConnectingPoint num="17" id="979" />
+<TGConnectingPoint num="18" id="980" />
+<TGConnectingPoint num="19" id="981" />
+<TGConnectingPoint num="20" id="982" />
+<TGConnectingPoint num="21" id="983" />
+<TGConnectingPoint num="22" id="984" />
+<TGConnectingPoint num="23" id="985" />
+<TGConnectingPoint num="24" id="986" />
+<TGConnectingPoint num="25" id="987" />
+<TGConnectingPoint num="26" id="988" />
+<TGConnectingPoint num="27" id="989" />
+<TGConnectingPoint num="28" id="990" />
+<TGConnectingPoint num="29" id="991" />
+<TGConnectingPoint num="30" id="992" />
+<TGConnectingPoint num="31" id="993" />
+<TGConnectingPoint num="32" id="994" />
+<TGConnectingPoint num="33" id="995" />
+<TGConnectingPoint num="34" id="996" />
+<TGConnectingPoint num="35" id="997" />
+<TGConnectingPoint num="36" id="998" />
+<TGConnectingPoint num="37" id="999" />
+<TGConnectingPoint num="38" id="1000" />
+<TGConnectingPoint num="39" id="1001" />
+<latencyCheck />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1004" >
 <cdparam x="400" y="40" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="991" />
+<TGConnectingPoint num="0" id="1003" />
 </COMPONENT>
 
-<COMPONENT type="5108" id="995" >
+<COMPONENT type="5108" id="1007" >
 <cdparam x="179" y="429" />
-<sizeparam width="216" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="993" />
-<TGConnectingPoint num="1" id="994" />
+<TGConnectingPoint num="0" id="1005" />
+<TGConnectingPoint num="1" id="1006" />
 <extraparam>
 <Data variable="distanceRight" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="998" >
-<cdparam x="179" y="355" />
-<sizeparam width="216" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="1010" >
+<cdparam x="178" y="355" />
+<sizeparam width="218" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="996" />
-<TGConnectingPoint num="1" id="997" />
+<TGConnectingPoint num="0" id="1008" />
+<TGConnectingPoint num="1" id="1009" />
 <extraparam>
 <Data variable="distanceFront" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="1001" >
-<cdparam x="184" y="292" />
-<sizeparam width="207" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="1013" >
+<cdparam x="183" y="292" />
+<sizeparam width="208" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="999" />
-<TGConnectingPoint num="1" id="1000" />
+<TGConnectingPoint num="0" id="1011" />
+<TGConnectingPoint num="1" id="1012" />
 <extraparam>
 <Data variable="distanceLeft" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
@@ -3514,25 +3579,25 @@ state 2: obstacles in close proximity
 </AVATARStateMachineDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="MainControl" minX="10" maxX="2500" minY="10" maxY="2500" >
-<CONNECTOR type="5102" id="1008" >
+<CONNECTOR type="5102" id="1020" >
 <cdparam x="436" y="1655" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1007" />
-<P1  x="436" y="1655" id="1348" />
-<P2  x="436" y="1679" id="1440" />
+<TGConnectingPoint num="0" id="1019" />
+<P1  x="436" y="1655" id="1360" />
+<P2  x="436" y="1679" id="1452" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1006" >
-<father id="1008" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1018" >
+<father id="1020" num="0" />
 <cdparam x="429" y="1710" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1002" />
-<TGConnectingPoint num="1" id="1003" />
-<TGConnectingPoint num="2" id="1004" />
-<TGConnectingPoint num="3" id="1005" />
+<TGConnectingPoint num="0" id="1014" />
+<TGConnectingPoint num="1" id="1015" />
+<TGConnectingPoint num="2" id="1016" />
+<TGConnectingPoint num="3" id="1017" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3542,25 +3607,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1015" >
+<CONNECTOR type="5102" id="1027" >
 <cdparam x="463" y="1168" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1014" />
-<P1  x="463" y="1168" id="1920" />
-<P2  x="411" y="1209" id="1460" />
+<TGConnectingPoint num="0" id="1026" />
+<P1  x="463" y="1168" id="1932" />
+<P2  x="411" y="1209" id="1472" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1013" >
-<father id="1015" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1025" >
+<father id="1027" num="0" />
 <cdparam x="433" y="1200" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1009" />
-<TGConnectingPoint num="1" id="1010" />
-<TGConnectingPoint num="2" id="1011" />
-<TGConnectingPoint num="3" id="1012" />
+<TGConnectingPoint num="0" id="1021" />
+<TGConnectingPoint num="1" id="1022" />
+<TGConnectingPoint num="2" id="1023" />
+<TGConnectingPoint num="3" id="1024" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3570,25 +3635,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1022" >
+<CONNECTOR type="5102" id="1034" >
 <cdparam x="367" y="1100" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1021" />
-<P1  x="367" y="1100" id="1495" />
-<P2  x="367" y="1209" id="1452" />
+<TGConnectingPoint num="0" id="1033" />
+<P1  x="367" y="1100" id="1507" />
+<P2  x="367" y="1209" id="1464" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1020" >
-<father id="1022" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1032" >
+<father id="1034" num="0" />
 <cdparam x="345" y="1144" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1016" />
-<TGConnectingPoint num="1" id="1017" />
-<TGConnectingPoint num="2" id="1018" />
-<TGConnectingPoint num="3" id="1019" />
+<TGConnectingPoint num="0" id="1028" />
+<TGConnectingPoint num="1" id="1029" />
+<TGConnectingPoint num="2" id="1030" />
+<TGConnectingPoint num="3" id="1031" />
 <extraparam>
 <guard value="[else ]" />
 <afterMin value="" />
@@ -3598,45 +3663,45 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1033" >
+<CONNECTOR type="5102" id="1045" >
 <cdparam x="360" y="1354" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1030" />
-<TGConnectingPoint num="1" id="1031" />
-<TGConnectingPoint num="2" id="1032" />
-<P1  x="436" y="1709" id="1441" />
-<P2  x="478" y="137" id="1880" />
+<TGConnectingPoint num="0" id="1042" />
+<TGConnectingPoint num="1" id="1043" />
+<TGConnectingPoint num="2" id="1044" />
+<P1  x="436" y="1709" id="1453" />
+<P2  x="478" y="137" id="1892" />
 <Point x="863" y="1719" />
 <Point x="875" y="140" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1023" >
-<father id="1033" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1035" >
+<father id="1045" num="0" />
 <cdparam x="863" y="1719" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1024" >
-<father id="1033" num="1" />
+<SUBCOMPONENT type="-1" id="1036" >
+<father id="1045" num="1" />
 <cdparam x="875" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="point " value="null" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1029" >
-<father id="1033" num="2" />
+<SUBCOMPONENT type="-1" id="1041" >
+<father id="1045" num="2" />
 <cdparam x="419" y="745" />
-<sizeparam width="70" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="72" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1025" />
-<TGConnectingPoint num="1" id="1026" />
-<TGConnectingPoint num="2" id="1027" />
-<TGConnectingPoint num="3" id="1028" />
+<TGConnectingPoint num="0" id="1037" />
+<TGConnectingPoint num="1" id="1038" />
+<TGConnectingPoint num="2" id="1039" />
+<TGConnectingPoint num="3" id="1040" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="0" />
@@ -3646,25 +3711,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1040" >
+<CONNECTOR type="5102" id="1052" >
 <cdparam x="392" y="1075" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1039" />
-<P1  x="392" y="1075" id="1494" />
-<P2  x="463" y="1138" id="1919" />
+<TGConnectingPoint num="0" id="1051" />
+<P1  x="392" y="1075" id="1506" />
+<P2  x="463" y="1138" id="1931" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1038" >
-<father id="1040" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1050" >
+<father id="1052" num="0" />
 <cdparam x="436" y="1084" />
-<sizeparam width="99" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1034" />
-<TGConnectingPoint num="1" id="1035" />
-<TGConnectingPoint num="2" id="1036" />
-<TGConnectingPoint num="3" id="1037" />
+<TGConnectingPoint num="0" id="1046" />
+<TGConnectingPoint num="1" id="1047" />
+<TGConnectingPoint num="2" id="1048" />
+<TGConnectingPoint num="3" id="1049" />
 <extraparam>
 <guard value="[ state&lt;2]" />
 <afterMin value="" />
@@ -3675,25 +3740,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1047" >
+<CONNECTOR type="5102" id="1059" >
 <cdparam x="464" y="950" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1046" />
-<P1  x="464" y="950" id="1550" />
-<P2  x="414" y="968" id="1517" />
+<TGConnectingPoint num="0" id="1058" />
+<P1  x="464" y="950" id="1562" />
+<P2  x="414" y="968" id="1529" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1045" >
-<father id="1047" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1057" >
+<father id="1059" num="0" />
 <cdparam x="439" y="959" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1041" />
-<TGConnectingPoint num="1" id="1042" />
-<TGConnectingPoint num="2" id="1043" />
-<TGConnectingPoint num="3" id="1044" />
+<TGConnectingPoint num="0" id="1053" />
+<TGConnectingPoint num="1" id="1054" />
+<TGConnectingPoint num="2" id="1055" />
+<TGConnectingPoint num="3" id="1056" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3703,25 +3768,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1054" >
+<CONNECTOR type="5102" id="1066" >
 <cdparam x="346" y="856" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1053" />
-<P1  x="346" y="856" id="1561" />
-<P2  x="320" y="968" id="1516" />
+<TGConnectingPoint num="0" id="1065" />
+<P1  x="346" y="856" id="1573" />
+<P2  x="320" y="968" id="1528" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1052" >
-<father id="1054" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1064" >
+<father id="1066" num="0" />
 <cdparam x="345" y="948" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1048" />
-<TGConnectingPoint num="1" id="1049" />
-<TGConnectingPoint num="2" id="1050" />
-<TGConnectingPoint num="3" id="1051" />
+<TGConnectingPoint num="0" id="1060" />
+<TGConnectingPoint num="1" id="1061" />
+<TGConnectingPoint num="2" id="1062" />
+<TGConnectingPoint num="3" id="1063" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3731,25 +3796,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1061" >
+<CONNECTOR type="5102" id="1073" >
 <cdparam x="530" y="603" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1060" />
-<P1  x="530" y="603" id="1732" />
-<P2  x="411" y="747" id="1595" />
+<TGConnectingPoint num="0" id="1072" />
+<P1  x="530" y="603" id="1744" />
+<P2  x="411" y="747" id="1607" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1059" >
-<father id="1061" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1071" >
+<father id="1073" num="0" />
 <cdparam x="518" y="652" />
-<sizeparam width="150" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="149" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1055" />
-<TGConnectingPoint num="1" id="1056" />
-<TGConnectingPoint num="2" id="1057" />
-<TGConnectingPoint num="3" id="1058" />
+<TGConnectingPoint num="0" id="1067" />
+<TGConnectingPoint num="1" id="1068" />
+<TGConnectingPoint num="2" id="1069" />
+<TGConnectingPoint num="3" id="1070" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3763,25 +3828,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1068" >
+<CONNECTOR type="5102" id="1080" >
 <cdparam x="233" y="608" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1067" />
-<P1  x="233" y="608" id="1814" />
-<P2  x="343" y="747" id="1584" />
+<TGConnectingPoint num="0" id="1079" />
+<P1  x="233" y="608" id="1826" />
+<P2  x="343" y="747" id="1596" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1066" >
-<father id="1068" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1078" >
+<father id="1080" num="0" />
 <cdparam x="123" y="652" />
 <sizeparam width="170" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1062" />
-<TGConnectingPoint num="1" id="1063" />
-<TGConnectingPoint num="2" id="1064" />
-<TGConnectingPoint num="3" id="1065" />
+<TGConnectingPoint num="0" id="1074" />
+<TGConnectingPoint num="1" id="1075" />
+<TGConnectingPoint num="2" id="1076" />
+<TGConnectingPoint num="3" id="1077" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3795,25 +3860,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1075" >
+<CONNECTOR type="5102" id="1087" >
 <cdparam x="407" y="147" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1074" />
-<P1  x="395" y="162" id="1882" />
-<P2  x="395" y="187" id="1865" />
+<TGConnectingPoint num="0" id="1086" />
+<P1  x="395" y="162" id="1894" />
+<P2  x="395" y="187" id="1877" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1073" >
-<father id="1075" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1085" >
+<father id="1087" num="0" />
 <cdparam x="401" y="167" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1069" />
-<TGConnectingPoint num="1" id="1070" />
-<TGConnectingPoint num="2" id="1071" />
-<TGConnectingPoint num="3" id="1072" />
+<TGConnectingPoint num="0" id="1081" />
+<TGConnectingPoint num="1" id="1082" />
+<TGConnectingPoint num="2" id="1083" />
+<TGConnectingPoint num="3" id="1084" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3823,25 +3888,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1082" >
+<CONNECTOR type="5102" id="1094" >
 <cdparam x="484" y="399" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1081" />
-<P1  x="484" y="399" id="1716" />
-<P2  x="412" y="423" id="1626" />
+<TGConnectingPoint num="0" id="1093" />
+<P1  x="484" y="399" id="1728" />
+<P2  x="412" y="423" id="1638" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1080" >
-<father id="1082" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1092" >
+<father id="1094" num="0" />
 <cdparam x="413" y="365" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1076" />
-<TGConnectingPoint num="1" id="1077" />
-<TGConnectingPoint num="2" id="1078" />
-<TGConnectingPoint num="3" id="1079" />
+<TGConnectingPoint num="0" id="1088" />
+<TGConnectingPoint num="1" id="1089" />
+<TGConnectingPoint num="2" id="1090" />
+<TGConnectingPoint num="3" id="1091" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3851,25 +3916,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1089" >
+<CONNECTOR type="5102" id="1101" >
 <cdparam x="371" y="275" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1088" />
-<P1  x="371" y="275" id="1659" />
-<P2  x="371" y="423" id="1618" />
+<TGConnectingPoint num="0" id="1100" />
+<P1  x="371" y="275" id="1671" />
+<P2  x="371" y="423" id="1630" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1087" >
-<father id="1089" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1099" >
+<father id="1101" num="0" />
 <cdparam x="354" y="356" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1083" />
-<TGConnectingPoint num="1" id="1084" />
-<TGConnectingPoint num="2" id="1085" />
-<TGConnectingPoint num="3" id="1086" />
+<TGConnectingPoint num="0" id="1095" />
+<TGConnectingPoint num="1" id="1096" />
+<TGConnectingPoint num="2" id="1097" />
+<TGConnectingPoint num="3" id="1098" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3879,25 +3944,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1096" >
+<CONNECTOR type="5102" id="1108" >
 <cdparam x="421" y="275" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1095" />
-<P1  x="421" y="275" id="1660" />
-<P2  x="484" y="291" id="1675" />
+<TGConnectingPoint num="0" id="1107" />
+<P1  x="421" y="275" id="1672" />
+<P2  x="484" y="291" id="1687" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1094" >
-<father id="1096" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1106" >
+<father id="1108" num="0" />
 <cdparam x="446" y="275" />
-<sizeparam width="74" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="75" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1090" />
-<TGConnectingPoint num="1" id="1091" />
-<TGConnectingPoint num="2" id="1092" />
-<TGConnectingPoint num="3" id="1093" />
+<TGConnectingPoint num="0" id="1102" />
+<TGConnectingPoint num="1" id="1103" />
+<TGConnectingPoint num="2" id="1104" />
+<TGConnectingPoint num="3" id="1105" />
 <extraparam>
 <guard value="[ state==2]" />
 <afterMin value="" />
@@ -3907,25 +3972,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1103" >
+<CONNECTOR type="5102" id="1115" >
 <cdparam x="395" y="75" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1102" />
-<P1  x="395" y="75" id="1917" />
-<P2  x="395" y="112" id="1877" />
+<TGConnectingPoint num="0" id="1114" />
+<P1  x="395" y="75" id="1929" />
+<P2  x="395" y="112" id="1889" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1101" >
-<father id="1103" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1113" >
+<father id="1115" num="0" />
 <cdparam x="396" y="94" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1097" />
-<TGConnectingPoint num="1" id="1098" />
-<TGConnectingPoint num="2" id="1099" />
-<TGConnectingPoint num="3" id="1100" />
+<TGConnectingPoint num="0" id="1109" />
+<TGConnectingPoint num="1" id="1110" />
+<TGConnectingPoint num="2" id="1111" />
+<TGConnectingPoint num="3" id="1112" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3935,25 +4000,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1110" >
+<CONNECTOR type="5102" id="1122" >
 <cdparam x="349" y="312" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1109" />
-<P1  x="395" y="217" id="1866" />
-<P2  x="396" y="250" id="1658" />
+<TGConnectingPoint num="0" id="1121" />
+<P1  x="395" y="217" id="1878" />
+<P2  x="396" y="250" id="1670" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1108" >
-<father id="1110" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1120" >
+<father id="1122" num="0" />
 <cdparam x="251" y="233" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1104" />
-<TGConnectingPoint num="1" id="1105" />
-<TGConnectingPoint num="2" id="1106" />
-<TGConnectingPoint num="3" id="1107" />
+<TGConnectingPoint num="0" id="1116" />
+<TGConnectingPoint num="1" id="1117" />
+<TGConnectingPoint num="2" id="1118" />
+<TGConnectingPoint num="3" id="1119" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3963,25 +4028,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1117" >
+<CONNECTOR type="5102" id="1129" >
 <cdparam x="372" y="530" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1116" />
-<P1  x="346" y="524" id="1850" />
-<P2  x="233" y="558" id="1809" />
+<TGConnectingPoint num="0" id="1128" />
+<P1  x="346" y="524" id="1862" />
+<P2  x="233" y="558" id="1821" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1115" >
-<father id="1117" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1127" >
+<father id="1129" num="0" />
 <cdparam x="208" y="524" />
-<sizeparam width="117" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="119" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1111" />
-<TGConnectingPoint num="1" id="1112" />
-<TGConnectingPoint num="2" id="1113" />
-<TGConnectingPoint num="3" id="1114" />
+<TGConnectingPoint num="0" id="1123" />
+<TGConnectingPoint num="1" id="1124" />
+<TGConnectingPoint num="2" id="1125" />
+<TGConnectingPoint num="3" id="1126" />
 <extraparam>
 <guard value="[ distanceFront&gt;8]" />
 <afterMin value="" />
@@ -3991,25 +4056,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1124" >
+<CONNECTOR type="5102" id="1136" >
 <cdparam x="372" y="530" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1123" />
-<P1  x="371" y="549" id="1855" />
-<P2  x="371" y="587" id="1768" />
+<TGConnectingPoint num="0" id="1135" />
+<P1  x="371" y="549" id="1867" />
+<P2  x="371" y="587" id="1780" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1122" >
-<father id="1124" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1134" >
+<father id="1136" num="0" />
 <cdparam x="327" y="565" />
-<sizeparam width="116" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="119" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1118" />
-<TGConnectingPoint num="1" id="1119" />
-<TGConnectingPoint num="2" id="1120" />
-<TGConnectingPoint num="3" id="1121" />
+<TGConnectingPoint num="0" id="1130" />
+<TGConnectingPoint num="1" id="1131" />
+<TGConnectingPoint num="2" id="1132" />
+<TGConnectingPoint num="3" id="1133" />
 <extraparam>
 <guard value="[distanceFront&lt;3 ]" />
 <afterMin value="" />
@@ -4019,25 +4084,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1131" >
+<CONNECTOR type="5102" id="1143" >
 <cdparam x="422" y="594" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1130" />
-<P1  x="396" y="524" id="1851" />
-<P2  x="530" y="553" id="1727" />
+<TGConnectingPoint num="0" id="1142" />
+<P1  x="396" y="524" id="1863" />
+<P2  x="530" y="553" id="1739" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1129" >
-<father id="1131" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1141" >
+<father id="1143" num="0" />
 <cdparam x="485" y="526" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1125" />
-<TGConnectingPoint num="1" id="1126" />
-<TGConnectingPoint num="2" id="1127" />
-<TGConnectingPoint num="3" id="1128" />
+<TGConnectingPoint num="0" id="1137" />
+<TGConnectingPoint num="1" id="1138" />
+<TGConnectingPoint num="2" id="1139" />
+<TGConnectingPoint num="3" id="1140" />
 <extraparam>
 <guard value="[ else]" />
 <afterMin value="" />
@@ -4047,25 +4112,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1138" >
+<CONNECTOR type="5102" id="1150" >
 <cdparam x="451" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1137" />
-<P1  x="484" y="341" id="1680" />
-<P2  x="484" y="369" id="1715" />
+<TGConnectingPoint num="0" id="1149" />
+<P1  x="484" y="341" id="1692" />
+<P2  x="484" y="369" id="1727" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1136" >
-<father id="1138" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1148" >
+<father id="1150" num="0" />
 <cdparam x="448" y="469" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1132" />
-<TGConnectingPoint num="1" id="1133" />
-<TGConnectingPoint num="2" id="1134" />
-<TGConnectingPoint num="3" id="1135" />
+<TGConnectingPoint num="0" id="1144" />
+<TGConnectingPoint num="1" id="1145" />
+<TGConnectingPoint num="2" id="1146" />
+<TGConnectingPoint num="3" id="1147" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4075,25 +4140,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1145" >
+<CONNECTOR type="5102" id="1157" >
 <cdparam x="436" y="522" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1144" />
-<P1  x="371" y="473" id="1623" />
-<P2  x="371" y="499" id="1849" />
+<TGConnectingPoint num="0" id="1156" />
+<P1  x="371" y="473" id="1635" />
+<P2  x="371" y="499" id="1861" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1143" >
-<father id="1145" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1155" >
+<father id="1157" num="0" />
 <cdparam x="437" y="543" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1139" />
-<TGConnectingPoint num="1" id="1140" />
-<TGConnectingPoint num="2" id="1141" />
-<TGConnectingPoint num="3" id="1142" />
+<TGConnectingPoint num="0" id="1151" />
+<TGConnectingPoint num="1" id="1152" />
+<TGConnectingPoint num="2" id="1153" />
+<TGConnectingPoint num="3" id="1154" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4103,25 +4168,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1152" >
+<CONNECTOR type="5102" id="1164" >
 <cdparam x="383" y="637" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1151" />
-<P1  x="371" y="637" id="1773" />
-<P2  x="371" y="747" id="1577" />
+<TGConnectingPoint num="0" id="1163" />
+<P1  x="371" y="637" id="1785" />
+<P2  x="371" y="747" id="1589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1150" >
-<father id="1152" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1162" >
+<father id="1164" num="0" />
 <cdparam x="378" y="681" />
 <sizeparam width="118" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1146" />
-<TGConnectingPoint num="1" id="1147" />
-<TGConnectingPoint num="2" id="1148" />
-<TGConnectingPoint num="3" id="1149" />
+<TGConnectingPoint num="0" id="1158" />
+<TGConnectingPoint num="1" id="1159" />
+<TGConnectingPoint num="2" id="1160" />
+<TGConnectingPoint num="3" id="1161" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4133,25 +4198,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1159" >
+<CONNECTOR type="5102" id="1171" >
 <cdparam x="371" y="797" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1158" />
-<P1  x="371" y="797" id="1582" />
-<P2  x="371" y="831" id="1560" />
+<TGConnectingPoint num="0" id="1170" />
+<P1  x="371" y="797" id="1594" />
+<P2  x="371" y="831" id="1572" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1157" >
-<father id="1159" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1169" >
+<father id="1171" num="0" />
 <cdparam x="368" y="815" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
-<TGConnectingPoint num="2" id="1155" />
-<TGConnectingPoint num="3" id="1156" />
+<TGConnectingPoint num="0" id="1165" />
+<TGConnectingPoint num="1" id="1166" />
+<TGConnectingPoint num="2" id="1167" />
+<TGConnectingPoint num="3" id="1168" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4161,25 +4226,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1166" >
+<CONNECTOR type="5102" id="1178" >
 <cdparam x="397" y="857" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1165" />
-<P1  x="396" y="856" id="1565" />
-<P2  x="464" y="920" id="1549" />
+<TGConnectingPoint num="0" id="1177" />
+<P1  x="396" y="856" id="1577" />
+<P2  x="464" y="920" id="1561" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1164" >
-<father id="1166" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1176" >
+<father id="1178" num="0" />
 <cdparam x="417" y="888" />
-<sizeparam width="169" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="168" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1160" />
-<TGConnectingPoint num="1" id="1161" />
-<TGConnectingPoint num="2" id="1162" />
-<TGConnectingPoint num="3" id="1163" />
+<TGConnectingPoint num="0" id="1172" />
+<TGConnectingPoint num="1" id="1173" />
+<TGConnectingPoint num="2" id="1174" />
+<TGConnectingPoint num="3" id="1175" />
 <extraparam>
 <guard value="[ samplingRate!=newRate]" />
 <afterMin value="" />
@@ -4189,25 +4254,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1173" >
+<CONNECTOR type="5102" id="1185" >
 <cdparam x="464" y="950" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1172" />
-<P1  x="367" y="1018" id="1514" />
-<P2  x="367" y="1050" id="1492" />
+<TGConnectingPoint num="0" id="1184" />
+<P1  x="367" y="1018" id="1526" />
+<P2  x="367" y="1050" id="1504" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1171" >
-<father id="1173" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1183" >
+<father id="1185" num="0" />
 <cdparam x="437" y="988" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1167" />
-<TGConnectingPoint num="1" id="1168" />
-<TGConnectingPoint num="2" id="1169" />
-<TGConnectingPoint num="3" id="1170" />
+<TGConnectingPoint num="0" id="1179" />
+<TGConnectingPoint num="1" id="1180" />
+<TGConnectingPoint num="2" id="1181" />
+<TGConnectingPoint num="3" id="1182" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4217,25 +4282,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1180" >
+<CONNECTOR type="5102" id="1192" >
 <cdparam x="342" y="1075" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1179" />
-<P1  x="342" y="1075" id="1496" />
-<P2  x="250" y="1142" id="1930" />
+<TGConnectingPoint num="0" id="1191" />
+<P1  x="342" y="1075" id="1508" />
+<P2  x="250" y="1142" id="1942" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1178" >
-<father id="1180" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1190" >
+<father id="1192" num="0" />
 <cdparam x="116" y="1091" />
-<sizeparam width="94" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="96" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1174" />
-<TGConnectingPoint num="1" id="1175" />
-<TGConnectingPoint num="2" id="1176" />
-<TGConnectingPoint num="3" id="1177" />
+<TGConnectingPoint num="0" id="1186" />
+<TGConnectingPoint num="1" id="1187" />
+<TGConnectingPoint num="2" id="1188" />
+<TGConnectingPoint num="3" id="1189" />
 <extraparam>
 <guard value="[ state==2]" />
 <afterMin value="" />
@@ -4246,25 +4311,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1187" >
+<CONNECTOR type="5102" id="1199" >
 <cdparam x="250" y="1172" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1186" />
-<P1  x="250" y="1172" id="1931" />
-<P2  x="323" y="1209" id="1459" />
+<TGConnectingPoint num="0" id="1198" />
+<P1  x="250" y="1172" id="1943" />
+<P2  x="323" y="1209" id="1471" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1185" >
-<father id="1187" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1197" >
+<father id="1199" num="0" />
 <cdparam x="275" y="1202" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1181" />
-<TGConnectingPoint num="1" id="1182" />
-<TGConnectingPoint num="2" id="1183" />
-<TGConnectingPoint num="3" id="1184" />
+<TGConnectingPoint num="0" id="1193" />
+<TGConnectingPoint num="1" id="1194" />
+<TGConnectingPoint num="2" id="1195" />
+<TGConnectingPoint num="3" id="1196" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4274,25 +4339,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1194" >
+<CONNECTOR type="5102" id="1206" >
 <cdparam x="311" y="1280" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1193" />
-<P1  x="342" y="1327" id="1425" />
-<P2  x="320" y="1605" id="1358" />
+<TGConnectingPoint num="0" id="1205" />
+<P1  x="342" y="1327" id="1437" />
+<P2  x="320" y="1605" id="1370" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1192" >
-<father id="1194" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1204" >
+<father id="1206" num="0" />
 <cdparam x="266" y="1316" />
-<sizeparam width="69" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="70" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1188" />
-<TGConnectingPoint num="1" id="1189" />
-<TGConnectingPoint num="2" id="1190" />
-<TGConnectingPoint num="3" id="1191" />
+<TGConnectingPoint num="0" id="1200" />
+<TGConnectingPoint num="1" id="1201" />
+<TGConnectingPoint num="2" id="1202" />
+<TGConnectingPoint num="3" id="1203" />
 <extraparam>
 <guard value="[ state!=2]" />
 <afterMin value="" />
@@ -4302,25 +4367,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1201" >
+<CONNECTOR type="5102" id="1213" >
 <cdparam x="432" y="1259" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1200" />
-<P1  x="367" y="1259" id="1457" />
-<P2  x="367" y="1302" id="1424" />
+<TGConnectingPoint num="0" id="1212" />
+<P1  x="367" y="1259" id="1469" />
+<P2  x="367" y="1302" id="1436" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1199" >
-<father id="1201" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1211" >
+<father id="1213" num="0" />
 <cdparam x="375" y="1270" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1195" />
-<TGConnectingPoint num="1" id="1196" />
-<TGConnectingPoint num="2" id="1197" />
-<TGConnectingPoint num="3" id="1198" />
+<TGConnectingPoint num="0" id="1207" />
+<TGConnectingPoint num="1" id="1208" />
+<TGConnectingPoint num="2" id="1209" />
+<TGConnectingPoint num="3" id="1210" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4330,25 +4395,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1208" >
+<CONNECTOR type="5102" id="1220" >
 <cdparam x="399" y="1295" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1207" />
-<P1  x="392" y="1327" id="1429" />
-<P2  x="436" y="1349" id="1383" />
+<TGConnectingPoint num="0" id="1219" />
+<P1  x="392" y="1327" id="1441" />
+<P2  x="436" y="1349" id="1395" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1206" >
-<father id="1208" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1218" >
+<father id="1220" num="0" />
 <cdparam x="422" y="1300" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1202" />
-<TGConnectingPoint num="1" id="1203" />
-<TGConnectingPoint num="2" id="1204" />
-<TGConnectingPoint num="3" id="1205" />
+<TGConnectingPoint num="0" id="1214" />
+<TGConnectingPoint num="1" id="1215" />
+<TGConnectingPoint num="2" id="1216" />
+<TGConnectingPoint num="3" id="1217" />
 <extraparam>
 <guard value="[else ]" />
 <afterMin value="" />
@@ -4358,25 +4423,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1215" >
+<CONNECTOR type="5102" id="1227" >
 <cdparam x="488" y="1399" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1214" />
-<P1  x="507" y="1399" id="1389" />
-<P2  x="507" y="1429" id="1326" />
+<TGConnectingPoint num="0" id="1226" />
+<P1  x="507" y="1399" id="1401" />
+<P2  x="507" y="1429" id="1338" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1213" >
-<father id="1215" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1225" >
+<father id="1227" num="0" />
 <cdparam x="491" y="1447" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1209" />
-<TGConnectingPoint num="1" id="1210" />
-<TGConnectingPoint num="2" id="1211" />
-<TGConnectingPoint num="3" id="1212" />
+<TGConnectingPoint num="0" id="1221" />
+<TGConnectingPoint num="1" id="1222" />
+<TGConnectingPoint num="2" id="1223" />
+<TGConnectingPoint num="3" id="1224" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4386,25 +4451,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1222" >
+<CONNECTOR type="5102" id="1234" >
 <cdparam x="495" y="1546" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1221" />
-<P1  x="482" y="1454" id="1327" />
-<P2  x="412" y="1489" id="1286" />
+<TGConnectingPoint num="0" id="1233" />
+<P1  x="482" y="1454" id="1339" />
+<P2  x="412" y="1489" id="1298" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1220" >
-<father id="1222" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1232" >
+<father id="1234" num="0" />
 <cdparam x="312" y="1453" />
-<sizeparam width="185" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="187" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1216" />
-<TGConnectingPoint num="1" id="1217" />
-<TGConnectingPoint num="2" id="1218" />
-<TGConnectingPoint num="3" id="1219" />
+<TGConnectingPoint num="0" id="1228" />
+<TGConnectingPoint num="1" id="1229" />
+<TGConnectingPoint num="2" id="1230" />
+<TGConnectingPoint num="3" id="1231" />
 <extraparam>
 <guard value="[ distanceLeft&gt;distanceRight]" />
 <afterMin value="" />
@@ -4414,25 +4479,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1229" >
+<CONNECTOR type="5102" id="1241" >
 <cdparam x="487" y="1493" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1228" />
-<P1  x="532" y="1454" id="1328" />
-<P2  x="604" y="1496" id="1262" />
+<TGConnectingPoint num="0" id="1240" />
+<P1  x="532" y="1454" id="1340" />
+<P2  x="604" y="1496" id="1274" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1227" >
-<father id="1229" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1239" >
+<father id="1241" num="0" />
 <cdparam x="571" y="1461" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1223" />
-<TGConnectingPoint num="1" id="1224" />
-<TGConnectingPoint num="2" id="1225" />
-<TGConnectingPoint num="3" id="1226" />
+<TGConnectingPoint num="0" id="1235" />
+<TGConnectingPoint num="1" id="1236" />
+<TGConnectingPoint num="2" id="1237" />
+<TGConnectingPoint num="3" id="1238" />
 <extraparam>
 <guard value="[ else]" />
 <afterMin value="" />
@@ -4442,25 +4507,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1236" >
+<CONNECTOR type="5102" id="1248" >
 <cdparam x="430" y="1540" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1235" />
-<P1  x="412" y="1539" id="1291" />
-<P2  x="472" y="1605" id="1360" />
+<TGConnectingPoint num="0" id="1247" />
+<P1  x="412" y="1539" id="1303" />
+<P2  x="472" y="1605" id="1372" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1234" >
-<father id="1236" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1246" >
+<father id="1248" num="0" />
 <cdparam x="376" y="1565" />
-<sizeparam width="150" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="149" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1230" />
-<TGConnectingPoint num="1" id="1231" />
-<TGConnectingPoint num="2" id="1232" />
-<TGConnectingPoint num="3" id="1233" />
+<TGConnectingPoint num="0" id="1242" />
+<TGConnectingPoint num="1" id="1243" />
+<TGConnectingPoint num="2" id="1244" />
+<TGConnectingPoint num="3" id="1245" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4472,25 +4537,25 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1243" >
+<CONNECTOR type="5102" id="1255" >
 <cdparam x="531" y="1591" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1242" />
-<P1  x="592" y="1546" id="1250" />
-<P2  x="512" y="1605" id="1351" />
+<TGConnectingPoint num="0" id="1254" />
+<P1  x="592" y="1546" id="1262" />
+<P2  x="512" y="1605" id="1363" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1241" >
-<father id="1243" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1253" >
+<father id="1255" num="0" />
 <cdparam x="583" y="1574" />
-<sizeparam width="142" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="140" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1237" />
-<TGConnectingPoint num="1" id="1238" />
-<TGConnectingPoint num="2" id="1239" />
-<TGConnectingPoint num="3" id="1240" />
+<TGConnectingPoint num="0" id="1249" />
+<TGConnectingPoint num="1" id="1250" />
+<TGConnectingPoint num="2" id="1251" />
+<TGConnectingPoint num="3" id="1252" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4502,909 +4567,909 @@ state 2: obstacles in close proximity
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1284" >
+<COMPONENT type="5106" id="1296" >
 <cdparam x="542" y="1496" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="turnRight" />
-<TGConnectingPoint num="0" id="1244" />
-<TGConnectingPoint num="1" id="1245" />
-<TGConnectingPoint num="2" id="1246" />
-<TGConnectingPoint num="3" id="1247" />
-<TGConnectingPoint num="4" id="1248" />
-<TGConnectingPoint num="5" id="1249" />
-<TGConnectingPoint num="6" id="1250" />
-<TGConnectingPoint num="7" id="1251" />
-<TGConnectingPoint num="8" id="1252" />
-<TGConnectingPoint num="9" id="1253" />
-<TGConnectingPoint num="10" id="1254" />
-<TGConnectingPoint num="11" id="1255" />
-<TGConnectingPoint num="12" id="1256" />
-<TGConnectingPoint num="13" id="1257" />
-<TGConnectingPoint num="14" id="1258" />
-<TGConnectingPoint num="15" id="1259" />
-<TGConnectingPoint num="16" id="1260" />
-<TGConnectingPoint num="17" id="1261" />
-<TGConnectingPoint num="18" id="1262" />
-<TGConnectingPoint num="19" id="1263" />
-<TGConnectingPoint num="20" id="1264" />
-<TGConnectingPoint num="21" id="1265" />
-<TGConnectingPoint num="22" id="1266" />
-<TGConnectingPoint num="23" id="1267" />
-<TGConnectingPoint num="24" id="1268" />
-<TGConnectingPoint num="25" id="1269" />
-<TGConnectingPoint num="26" id="1270" />
-<TGConnectingPoint num="27" id="1271" />
-<TGConnectingPoint num="28" id="1272" />
-<TGConnectingPoint num="29" id="1273" />
-<TGConnectingPoint num="30" id="1274" />
-<TGConnectingPoint num="31" id="1275" />
-<TGConnectingPoint num="32" id="1276" />
-<TGConnectingPoint num="33" id="1277" />
-<TGConnectingPoint num="34" id="1278" />
-<TGConnectingPoint num="35" id="1279" />
-<TGConnectingPoint num="36" id="1280" />
-<TGConnectingPoint num="37" id="1281" />
-<TGConnectingPoint num="38" id="1282" />
-<TGConnectingPoint num="39" id="1283" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1325" >
+<TGConnectingPoint num="0" id="1256" />
+<TGConnectingPoint num="1" id="1257" />
+<TGConnectingPoint num="2" id="1258" />
+<TGConnectingPoint num="3" id="1259" />
+<TGConnectingPoint num="4" id="1260" />
+<TGConnectingPoint num="5" id="1261" />
+<TGConnectingPoint num="6" id="1262" />
+<TGConnectingPoint num="7" id="1263" />
+<TGConnectingPoint num="8" id="1264" />
+<TGConnectingPoint num="9" id="1265" />
+<TGConnectingPoint num="10" id="1266" />
+<TGConnectingPoint num="11" id="1267" />
+<TGConnectingPoint num="12" id="1268" />
+<TGConnectingPoint num="13" id="1269" />
+<TGConnectingPoint num="14" id="1270" />
+<TGConnectingPoint num="15" id="1271" />
+<TGConnectingPoint num="16" id="1272" />
+<TGConnectingPoint num="17" id="1273" />
+<TGConnectingPoint num="18" id="1274" />
+<TGConnectingPoint num="19" id="1275" />
+<TGConnectingPoint num="20" id="1276" />
+<TGConnectingPoint num="21" id="1277" />
+<TGConnectingPoint num="22" id="1278" />
+<TGConnectingPoint num="23" id="1279" />
+<TGConnectingPoint num="24" id="1280" />
+<TGConnectingPoint num="25" id="1281" />
+<TGConnectingPoint num="26" id="1282" />
+<TGConnectingPoint num="27" id="1283" />
+<TGConnectingPoint num="28" id="1284" />
+<TGConnectingPoint num="29" id="1285" />
+<TGConnectingPoint num="30" id="1286" />
+<TGConnectingPoint num="31" id="1287" />
+<TGConnectingPoint num="32" id="1288" />
+<TGConnectingPoint num="33" id="1289" />
+<TGConnectingPoint num="34" id="1290" />
+<TGConnectingPoint num="35" id="1291" />
+<TGConnectingPoint num="36" id="1292" />
+<TGConnectingPoint num="37" id="1293" />
+<TGConnectingPoint num="38" id="1294" />
+<TGConnectingPoint num="39" id="1295" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1337" >
 <cdparam x="362" y="1489" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="turnLeft" />
-<TGConnectingPoint num="0" id="1285" />
-<TGConnectingPoint num="1" id="1286" />
-<TGConnectingPoint num="2" id="1287" />
-<TGConnectingPoint num="3" id="1288" />
-<TGConnectingPoint num="4" id="1289" />
-<TGConnectingPoint num="5" id="1290" />
-<TGConnectingPoint num="6" id="1291" />
-<TGConnectingPoint num="7" id="1292" />
-<TGConnectingPoint num="8" id="1293" />
-<TGConnectingPoint num="9" id="1294" />
-<TGConnectingPoint num="10" id="1295" />
-<TGConnectingPoint num="11" id="1296" />
-<TGConnectingPoint num="12" id="1297" />
-<TGConnectingPoint num="13" id="1298" />
-<TGConnectingPoint num="14" id="1299" />
-<TGConnectingPoint num="15" id="1300" />
-<TGConnectingPoint num="16" id="1301" />
-<TGConnectingPoint num="17" id="1302" />
-<TGConnectingPoint num="18" id="1303" />
-<TGConnectingPoint num="19" id="1304" />
-<TGConnectingPoint num="20" id="1305" />
-<TGConnectingPoint num="21" id="1306" />
-<TGConnectingPoint num="22" id="1307" />
-<TGConnectingPoint num="23" id="1308" />
-<TGConnectingPoint num="24" id="1309" />
-<TGConnectingPoint num="25" id="1310" />
-<TGConnectingPoint num="26" id="1311" />
-<TGConnectingPoint num="27" id="1312" />
-<TGConnectingPoint num="28" id="1313" />
-<TGConnectingPoint num="29" id="1314" />
-<TGConnectingPoint num="30" id="1315" />
-<TGConnectingPoint num="31" id="1316" />
-<TGConnectingPoint num="32" id="1317" />
-<TGConnectingPoint num="33" id="1318" />
-<TGConnectingPoint num="34" id="1319" />
-<TGConnectingPoint num="35" id="1320" />
-<TGConnectingPoint num="36" id="1321" />
-<TGConnectingPoint num="37" id="1322" />
-<TGConnectingPoint num="38" id="1323" />
-<TGConnectingPoint num="39" id="1324" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="1341" >
+<TGConnectingPoint num="0" id="1297" />
+<TGConnectingPoint num="1" id="1298" />
+<TGConnectingPoint num="2" id="1299" />
+<TGConnectingPoint num="3" id="1300" />
+<TGConnectingPoint num="4" id="1301" />
+<TGConnectingPoint num="5" id="1302" />
+<TGConnectingPoint num="6" id="1303" />
+<TGConnectingPoint num="7" id="1304" />
+<TGConnectingPoint num="8" id="1305" />
+<TGConnectingPoint num="9" id="1306" />
+<TGConnectingPoint num="10" id="1307" />
+<TGConnectingPoint num="11" id="1308" />
+<TGConnectingPoint num="12" id="1309" />
+<TGConnectingPoint num="13" id="1310" />
+<TGConnectingPoint num="14" id="1311" />
+<TGConnectingPoint num="15" id="1312" />
+<TGConnectingPoint num="16" id="1313" />
+<TGConnectingPoint num="17" id="1314" />
+<TGConnectingPoint num="18" id="1315" />
+<TGConnectingPoint num="19" id="1316" />
+<TGConnectingPoint num="20" id="1317" />
+<TGConnectingPoint num="21" id="1318" />
+<TGConnectingPoint num="22" id="1319" />
+<TGConnectingPoint num="23" id="1320" />
+<TGConnectingPoint num="24" id="1321" />
+<TGConnectingPoint num="25" id="1322" />
+<TGConnectingPoint num="26" id="1323" />
+<TGConnectingPoint num="27" id="1324" />
+<TGConnectingPoint num="28" id="1325" />
+<TGConnectingPoint num="29" id="1326" />
+<TGConnectingPoint num="30" id="1327" />
+<TGConnectingPoint num="31" id="1328" />
+<TGConnectingPoint num="32" id="1329" />
+<TGConnectingPoint num="33" id="1330" />
+<TGConnectingPoint num="34" id="1331" />
+<TGConnectingPoint num="35" id="1332" />
+<TGConnectingPoint num="36" id="1333" />
+<TGConnectingPoint num="37" id="1334" />
+<TGConnectingPoint num="38" id="1335" />
+<TGConnectingPoint num="39" id="1336" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="1353" >
 <cdparam x="492" y="1439" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1326" />
-<TGConnectingPoint num="1" id="1327" />
-<TGConnectingPoint num="2" id="1328" />
-<TGConnectingPoint num="3" id="1329" />
-<TGConnectingPoint num="4" id="1330" />
-<TGConnectingPoint num="5" id="1331" />
-<TGConnectingPoint num="6" id="1332" />
-<TGConnectingPoint num="7" id="1333" />
-<TGConnectingPoint num="8" id="1334" />
-<TGConnectingPoint num="9" id="1335" />
-<TGConnectingPoint num="10" id="1336" />
-<TGConnectingPoint num="11" id="1337" />
-<TGConnectingPoint num="12" id="1338" />
-<TGConnectingPoint num="13" id="1339" />
-<TGConnectingPoint num="14" id="1340" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1382" >
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="4" id="1342" />
+<TGConnectingPoint num="5" id="1343" />
+<TGConnectingPoint num="6" id="1344" />
+<TGConnectingPoint num="7" id="1345" />
+<TGConnectingPoint num="8" id="1346" />
+<TGConnectingPoint num="9" id="1347" />
+<TGConnectingPoint num="10" id="1348" />
+<TGConnectingPoint num="11" id="1349" />
+<TGConnectingPoint num="12" id="1350" />
+<TGConnectingPoint num="13" id="1351" />
+<TGConnectingPoint num="14" id="1352" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1394" >
 <cdparam x="284" y="1605" />
 <sizeparam width="304" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="sendMotorCommand" />
-<TGConnectingPoint num="0" id="1342" />
-<TGConnectingPoint num="1" id="1343" />
-<TGConnectingPoint num="2" id="1344" />
-<TGConnectingPoint num="3" id="1345" />
-<TGConnectingPoint num="4" id="1346" />
-<TGConnectingPoint num="5" id="1347" />
-<TGConnectingPoint num="6" id="1348" />
-<TGConnectingPoint num="7" id="1349" />
-<TGConnectingPoint num="8" id="1350" />
-<TGConnectingPoint num="9" id="1351" />
-<TGConnectingPoint num="10" id="1352" />
-<TGConnectingPoint num="11" id="1353" />
-<TGConnectingPoint num="12" id="1354" />
-<TGConnectingPoint num="13" id="1355" />
-<TGConnectingPoint num="14" id="1356" />
-<TGConnectingPoint num="15" id="1357" />
-<TGConnectingPoint num="16" id="1358" />
-<TGConnectingPoint num="17" id="1359" />
-<TGConnectingPoint num="18" id="1360" />
-<TGConnectingPoint num="19" id="1361" />
-<TGConnectingPoint num="20" id="1362" />
-<TGConnectingPoint num="21" id="1363" />
-<TGConnectingPoint num="22" id="1364" />
-<TGConnectingPoint num="23" id="1365" />
-<TGConnectingPoint num="24" id="1366" />
-<TGConnectingPoint num="25" id="1367" />
-<TGConnectingPoint num="26" id="1368" />
-<TGConnectingPoint num="27" id="1369" />
-<TGConnectingPoint num="28" id="1370" />
-<TGConnectingPoint num="29" id="1371" />
-<TGConnectingPoint num="30" id="1372" />
-<TGConnectingPoint num="31" id="1373" />
-<TGConnectingPoint num="32" id="1374" />
-<TGConnectingPoint num="33" id="1375" />
-<TGConnectingPoint num="34" id="1376" />
-<TGConnectingPoint num="35" id="1377" />
-<TGConnectingPoint num="36" id="1378" />
-<TGConnectingPoint num="37" id="1379" />
-<TGConnectingPoint num="38" id="1380" />
-<TGConnectingPoint num="39" id="1381" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1423" >
+<TGConnectingPoint num="0" id="1354" />
+<TGConnectingPoint num="1" id="1355" />
+<TGConnectingPoint num="2" id="1356" />
+<TGConnectingPoint num="3" id="1357" />
+<TGConnectingPoint num="4" id="1358" />
+<TGConnectingPoint num="5" id="1359" />
+<TGConnectingPoint num="6" id="1360" />
+<TGConnectingPoint num="7" id="1361" />
+<TGConnectingPoint num="8" id="1362" />
+<TGConnectingPoint num="9" id="1363" />
+<TGConnectingPoint num="10" id="1364" />
+<TGConnectingPoint num="11" id="1365" />
+<TGConnectingPoint num="12" id="1366" />
+<TGConnectingPoint num="13" id="1367" />
+<TGConnectingPoint num="14" id="1368" />
+<TGConnectingPoint num="15" id="1369" />
+<TGConnectingPoint num="16" id="1370" />
+<TGConnectingPoint num="17" id="1371" />
+<TGConnectingPoint num="18" id="1372" />
+<TGConnectingPoint num="19" id="1373" />
+<TGConnectingPoint num="20" id="1374" />
+<TGConnectingPoint num="21" id="1375" />
+<TGConnectingPoint num="22" id="1376" />
+<TGConnectingPoint num="23" id="1377" />
+<TGConnectingPoint num="24" id="1378" />
+<TGConnectingPoint num="25" id="1379" />
+<TGConnectingPoint num="26" id="1380" />
+<TGConnectingPoint num="27" id="1381" />
+<TGConnectingPoint num="28" id="1382" />
+<TGConnectingPoint num="29" id="1383" />
+<TGConnectingPoint num="30" id="1384" />
+<TGConnectingPoint num="31" id="1385" />
+<TGConnectingPoint num="32" id="1386" />
+<TGConnectingPoint num="33" id="1387" />
+<TGConnectingPoint num="34" id="1388" />
+<TGConnectingPoint num="35" id="1389" />
+<TGConnectingPoint num="36" id="1390" />
+<TGConnectingPoint num="37" id="1391" />
+<TGConnectingPoint num="38" id="1392" />
+<TGConnectingPoint num="39" id="1393" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1435" >
 <cdparam x="436" y="1349" />
 <sizeparam width="143" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="dodgeObstacle" />
-<TGConnectingPoint num="0" id="1383" />
-<TGConnectingPoint num="1" id="1384" />
-<TGConnectingPoint num="2" id="1385" />
-<TGConnectingPoint num="3" id="1386" />
-<TGConnectingPoint num="4" id="1387" />
-<TGConnectingPoint num="5" id="1388" />
-<TGConnectingPoint num="6" id="1389" />
-<TGConnectingPoint num="7" id="1390" />
-<TGConnectingPoint num="8" id="1391" />
-<TGConnectingPoint num="9" id="1392" />
-<TGConnectingPoint num="10" id="1393" />
-<TGConnectingPoint num="11" id="1394" />
-<TGConnectingPoint num="12" id="1395" />
-<TGConnectingPoint num="13" id="1396" />
-<TGConnectingPoint num="14" id="1397" />
-<TGConnectingPoint num="15" id="1398" />
-<TGConnectingPoint num="16" id="1399" />
-<TGConnectingPoint num="17" id="1400" />
-<TGConnectingPoint num="18" id="1401" />
-<TGConnectingPoint num="19" id="1402" />
-<TGConnectingPoint num="20" id="1403" />
-<TGConnectingPoint num="21" id="1404" />
-<TGConnectingPoint num="22" id="1405" />
-<TGConnectingPoint num="23" id="1406" />
-<TGConnectingPoint num="24" id="1407" />
-<TGConnectingPoint num="25" id="1408" />
-<TGConnectingPoint num="26" id="1409" />
-<TGConnectingPoint num="27" id="1410" />
-<TGConnectingPoint num="28" id="1411" />
-<TGConnectingPoint num="29" id="1412" />
-<TGConnectingPoint num="30" id="1413" />
-<TGConnectingPoint num="31" id="1414" />
-<TGConnectingPoint num="32" id="1415" />
-<TGConnectingPoint num="33" id="1416" />
-<TGConnectingPoint num="34" id="1417" />
-<TGConnectingPoint num="35" id="1418" />
-<TGConnectingPoint num="36" id="1419" />
-<TGConnectingPoint num="37" id="1420" />
-<TGConnectingPoint num="38" id="1421" />
-<TGConnectingPoint num="39" id="1422" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="1439" >
+<TGConnectingPoint num="0" id="1395" />
+<TGConnectingPoint num="1" id="1396" />
+<TGConnectingPoint num="2" id="1397" />
+<TGConnectingPoint num="3" id="1398" />
+<TGConnectingPoint num="4" id="1399" />
+<TGConnectingPoint num="5" id="1400" />
+<TGConnectingPoint num="6" id="1401" />
+<TGConnectingPoint num="7" id="1402" />
+<TGConnectingPoint num="8" id="1403" />
+<TGConnectingPoint num="9" id="1404" />
+<TGConnectingPoint num="10" id="1405" />
+<TGConnectingPoint num="11" id="1406" />
+<TGConnectingPoint num="12" id="1407" />
+<TGConnectingPoint num="13" id="1408" />
+<TGConnectingPoint num="14" id="1409" />
+<TGConnectingPoint num="15" id="1410" />
+<TGConnectingPoint num="16" id="1411" />
+<TGConnectingPoint num="17" id="1412" />
+<TGConnectingPoint num="18" id="1413" />
+<TGConnectingPoint num="19" id="1414" />
+<TGConnectingPoint num="20" id="1415" />
+<TGConnectingPoint num="21" id="1416" />
+<TGConnectingPoint num="22" id="1417" />
+<TGConnectingPoint num="23" id="1418" />
+<TGConnectingPoint num="24" id="1419" />
+<TGConnectingPoint num="25" id="1420" />
+<TGConnectingPoint num="26" id="1421" />
+<TGConnectingPoint num="27" id="1422" />
+<TGConnectingPoint num="28" id="1423" />
+<TGConnectingPoint num="29" id="1424" />
+<TGConnectingPoint num="30" id="1425" />
+<TGConnectingPoint num="31" id="1426" />
+<TGConnectingPoint num="32" id="1427" />
+<TGConnectingPoint num="33" id="1428" />
+<TGConnectingPoint num="34" id="1429" />
+<TGConnectingPoint num="35" id="1430" />
+<TGConnectingPoint num="36" id="1431" />
+<TGConnectingPoint num="37" id="1432" />
+<TGConnectingPoint num="38" id="1433" />
+<TGConnectingPoint num="39" id="1434" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="1451" >
 <cdparam x="352" y="1312" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1424" />
-<TGConnectingPoint num="1" id="1425" />
-<TGConnectingPoint num="2" id="1426" />
-<TGConnectingPoint num="3" id="1427" />
-<TGConnectingPoint num="4" id="1428" />
-<TGConnectingPoint num="5" id="1429" />
-<TGConnectingPoint num="6" id="1430" />
-<TGConnectingPoint num="7" id="1431" />
-<TGConnectingPoint num="8" id="1432" />
-<TGConnectingPoint num="9" id="1433" />
-<TGConnectingPoint num="10" id="1434" />
-<TGConnectingPoint num="11" id="1435" />
-<TGConnectingPoint num="12" id="1436" />
-<TGConnectingPoint num="13" id="1437" />
-<TGConnectingPoint num="14" id="1438" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1450" >
+<TGConnectingPoint num="0" id="1436" />
+<TGConnectingPoint num="1" id="1437" />
+<TGConnectingPoint num="2" id="1438" />
+<TGConnectingPoint num="3" id="1439" />
+<TGConnectingPoint num="4" id="1440" />
+<TGConnectingPoint num="5" id="1441" />
+<TGConnectingPoint num="6" id="1442" />
+<TGConnectingPoint num="7" id="1443" />
+<TGConnectingPoint num="8" id="1444" />
+<TGConnectingPoint num="9" id="1445" />
+<TGConnectingPoint num="10" id="1446" />
+<TGConnectingPoint num="11" id="1447" />
+<TGConnectingPoint num="12" id="1448" />
+<TGConnectingPoint num="13" id="1449" />
+<TGConnectingPoint num="14" id="1450" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1462" >
 <cdparam x="300" y="1684" />
 <sizeparam width="272" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Send signal" value="motorCommand(leftVelocity, rightVelocity)" />
-<TGConnectingPoint num="0" id="1440" />
-<TGConnectingPoint num="1" id="1441" />
-<TGConnectingPoint num="2" id="1442" />
-<TGConnectingPoint num="3" id="1443" />
-<TGConnectingPoint num="4" id="1444" />
-<TGConnectingPoint num="5" id="1445" />
-<TGConnectingPoint num="6" id="1446" />
-<TGConnectingPoint num="7" id="1447" />
-<TGConnectingPoint num="8" id="1448" />
-<TGConnectingPoint num="9" id="1449" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1491" >
+<TGConnectingPoint num="0" id="1452" />
+<TGConnectingPoint num="1" id="1453" />
+<TGConnectingPoint num="2" id="1454" />
+<TGConnectingPoint num="3" id="1455" />
+<TGConnectingPoint num="4" id="1456" />
+<TGConnectingPoint num="5" id="1457" />
+<TGConnectingPoint num="6" id="1458" />
+<TGConnectingPoint num="7" id="1459" />
+<TGConnectingPoint num="8" id="1460" />
+<TGConnectingPoint num="9" id="1461" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1503" >
 <cdparam x="279" y="1209" />
 <sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="setVelocity" />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
-<TGConnectingPoint num="2" id="1453" />
-<TGConnectingPoint num="3" id="1454" />
-<TGConnectingPoint num="4" id="1455" />
-<TGConnectingPoint num="5" id="1456" />
-<TGConnectingPoint num="6" id="1457" />
-<TGConnectingPoint num="7" id="1458" />
-<TGConnectingPoint num="8" id="1459" />
-<TGConnectingPoint num="9" id="1460" />
-<TGConnectingPoint num="10" id="1461" />
-<TGConnectingPoint num="11" id="1462" />
-<TGConnectingPoint num="12" id="1463" />
-<TGConnectingPoint num="13" id="1464" />
-<TGConnectingPoint num="14" id="1465" />
-<TGConnectingPoint num="15" id="1466" />
-<TGConnectingPoint num="16" id="1467" />
-<TGConnectingPoint num="17" id="1468" />
-<TGConnectingPoint num="18" id="1469" />
-<TGConnectingPoint num="19" id="1470" />
-<TGConnectingPoint num="20" id="1471" />
-<TGConnectingPoint num="21" id="1472" />
-<TGConnectingPoint num="22" id="1473" />
-<TGConnectingPoint num="23" id="1474" />
-<TGConnectingPoint num="24" id="1475" />
-<TGConnectingPoint num="25" id="1476" />
-<TGConnectingPoint num="26" id="1477" />
-<TGConnectingPoint num="27" id="1478" />
-<TGConnectingPoint num="28" id="1479" />
-<TGConnectingPoint num="29" id="1480" />
-<TGConnectingPoint num="30" id="1481" />
-<TGConnectingPoint num="31" id="1482" />
-<TGConnectingPoint num="32" id="1483" />
-<TGConnectingPoint num="33" id="1484" />
-<TGConnectingPoint num="34" id="1485" />
-<TGConnectingPoint num="35" id="1486" />
-<TGConnectingPoint num="36" id="1487" />
-<TGConnectingPoint num="37" id="1488" />
-<TGConnectingPoint num="38" id="1489" />
-<TGConnectingPoint num="39" id="1490" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="1507" >
+<TGConnectingPoint num="0" id="1463" />
+<TGConnectingPoint num="1" id="1464" />
+<TGConnectingPoint num="2" id="1465" />
+<TGConnectingPoint num="3" id="1466" />
+<TGConnectingPoint num="4" id="1467" />
+<TGConnectingPoint num="5" id="1468" />
+<TGConnectingPoint num="6" id="1469" />
+<TGConnectingPoint num="7" id="1470" />
+<TGConnectingPoint num="8" id="1471" />
+<TGConnectingPoint num="9" id="1472" />
+<TGConnectingPoint num="10" id="1473" />
+<TGConnectingPoint num="11" id="1474" />
+<TGConnectingPoint num="12" id="1475" />
+<TGConnectingPoint num="13" id="1476" />
+<TGConnectingPoint num="14" id="1477" />
+<TGConnectingPoint num="15" id="1478" />
+<TGConnectingPoint num="16" id="1479" />
+<TGConnectingPoint num="17" id="1480" />
+<TGConnectingPoint num="18" id="1481" />
+<TGConnectingPoint num="19" id="1482" />
+<TGConnectingPoint num="20" id="1483" />
+<TGConnectingPoint num="21" id="1484" />
+<TGConnectingPoint num="22" id="1485" />
+<TGConnectingPoint num="23" id="1486" />
+<TGConnectingPoint num="24" id="1487" />
+<TGConnectingPoint num="25" id="1488" />
+<TGConnectingPoint num="26" id="1489" />
+<TGConnectingPoint num="27" id="1490" />
+<TGConnectingPoint num="28" id="1491" />
+<TGConnectingPoint num="29" id="1492" />
+<TGConnectingPoint num="30" id="1493" />
+<TGConnectingPoint num="31" id="1494" />
+<TGConnectingPoint num="32" id="1495" />
+<TGConnectingPoint num="33" id="1496" />
+<TGConnectingPoint num="34" id="1497" />
+<TGConnectingPoint num="35" id="1498" />
+<TGConnectingPoint num="36" id="1499" />
+<TGConnectingPoint num="37" id="1500" />
+<TGConnectingPoint num="38" id="1501" />
+<TGConnectingPoint num="39" id="1502" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="1519" >
 <cdparam x="352" y="1060" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<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" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1548" >
+<TGConnectingPoint num="0" id="1504" />
+<TGConnectingPoint num="1" id="1505" />
+<TGConnectingPoint num="2" id="1506" />
+<TGConnectingPoint num="3" id="1507" />
+<TGConnectingPoint num="4" id="1508" />
+<TGConnectingPoint num="5" id="1509" />
+<TGConnectingPoint num="6" id="1510" />
+<TGConnectingPoint num="7" id="1511" />
+<TGConnectingPoint num="8" id="1512" />
+<TGConnectingPoint num="9" id="1513" />
+<TGConnectingPoint num="10" id="1514" />
+<TGConnectingPoint num="11" id="1515" />
+<TGConnectingPoint num="12" id="1516" />
+<TGConnectingPoint num="13" id="1517" />
+<TGConnectingPoint num="14" id="1518" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1560" >
 <cdparam x="274" y="968" />
 <sizeparam width="187" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="controlTempSensor" />
-<TGConnectingPoint num="0" id="1508" />
-<TGConnectingPoint num="1" id="1509" />
-<TGConnectingPoint num="2" id="1510" />
-<TGConnectingPoint num="3" id="1511" />
-<TGConnectingPoint num="4" id="1512" />
-<TGConnectingPoint num="5" id="1513" />
-<TGConnectingPoint num="6" id="1514" />
-<TGConnectingPoint num="7" id="1515" />
-<TGConnectingPoint num="8" id="1516" />
-<TGConnectingPoint num="9" id="1517" />
-<TGConnectingPoint num="10" id="1518" />
-<TGConnectingPoint num="11" id="1519" />
-<TGConnectingPoint num="12" id="1520" />
-<TGConnectingPoint num="13" id="1521" />
-<TGConnectingPoint num="14" id="1522" />
-<TGConnectingPoint num="15" id="1523" />
-<TGConnectingPoint num="16" id="1524" />
-<TGConnectingPoint num="17" id="1525" />
-<TGConnectingPoint num="18" id="1526" />
-<TGConnectingPoint num="19" id="1527" />
-<TGConnectingPoint num="20" id="1528" />
-<TGConnectingPoint num="21" id="1529" />
-<TGConnectingPoint num="22" id="1530" />
-<TGConnectingPoint num="23" id="1531" />
-<TGConnectingPoint num="24" id="1532" />
-<TGConnectingPoint num="25" id="1533" />
-<TGConnectingPoint num="26" id="1534" />
-<TGConnectingPoint num="27" id="1535" />
-<TGConnectingPoint num="28" id="1536" />
-<TGConnectingPoint num="29" id="1537" />
-<TGConnectingPoint num="30" id="1538" />
-<TGConnectingPoint num="31" id="1539" />
-<TGConnectingPoint num="32" id="1540" />
-<TGConnectingPoint num="33" id="1541" />
-<TGConnectingPoint num="34" id="1542" />
-<TGConnectingPoint num="35" id="1543" />
-<TGConnectingPoint num="36" id="1544" />
-<TGConnectingPoint num="37" id="1545" />
-<TGConnectingPoint num="38" id="1546" />
-<TGConnectingPoint num="39" id="1547" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5103" id="1559" >
+<TGConnectingPoint num="0" id="1520" />
+<TGConnectingPoint num="1" id="1521" />
+<TGConnectingPoint num="2" id="1522" />
+<TGConnectingPoint num="3" id="1523" />
+<TGConnectingPoint num="4" id="1524" />
+<TGConnectingPoint num="5" id="1525" />
+<TGConnectingPoint num="6" id="1526" />
+<TGConnectingPoint num="7" id="1527" />
+<TGConnectingPoint num="8" id="1528" />
+<TGConnectingPoint num="9" id="1529" />
+<TGConnectingPoint num="10" id="1530" />
+<TGConnectingPoint num="11" id="1531" />
+<TGConnectingPoint num="12" id="1532" />
+<TGConnectingPoint num="13" id="1533" />
+<TGConnectingPoint num="14" id="1534" />
+<TGConnectingPoint num="15" id="1535" />
+<TGConnectingPoint num="16" id="1536" />
+<TGConnectingPoint num="17" id="1537" />
+<TGConnectingPoint num="18" id="1538" />
+<TGConnectingPoint num="19" id="1539" />
+<TGConnectingPoint num="20" id="1540" />
+<TGConnectingPoint num="21" id="1541" />
+<TGConnectingPoint num="22" id="1542" />
+<TGConnectingPoint num="23" id="1543" />
+<TGConnectingPoint num="24" id="1544" />
+<TGConnectingPoint num="25" id="1545" />
+<TGConnectingPoint num="26" id="1546" />
+<TGConnectingPoint num="27" id="1547" />
+<TGConnectingPoint num="28" id="1548" />
+<TGConnectingPoint num="29" id="1549" />
+<TGConnectingPoint num="30" id="1550" />
+<TGConnectingPoint num="31" id="1551" />
+<TGConnectingPoint num="32" id="1552" />
+<TGConnectingPoint num="33" id="1553" />
+<TGConnectingPoint num="34" id="1554" />
+<TGConnectingPoint num="35" id="1555" />
+<TGConnectingPoint num="36" id="1556" />
+<TGConnectingPoint num="37" id="1557" />
+<TGConnectingPoint num="38" id="1558" />
+<TGConnectingPoint num="39" id="1559" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5103" id="1571" >
 <cdparam x="374" y="925" />
-<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="181" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Send signal" value="changeRate(samplingRate)" />
-<TGConnectingPoint num="0" id="1549" />
-<TGConnectingPoint num="1" id="1550" />
-<TGConnectingPoint num="2" id="1551" />
-<TGConnectingPoint num="3" id="1552" />
-<TGConnectingPoint num="4" id="1553" />
-<TGConnectingPoint num="5" id="1554" />
-<TGConnectingPoint num="6" id="1555" />
-<TGConnectingPoint num="7" id="1556" />
-<TGConnectingPoint num="8" id="1557" />
-<TGConnectingPoint num="9" id="1558" />
-</COMPONENT>
-
-<COMPONENT type="5107" id="1575" >
+<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="8" id="1569" />
+<TGConnectingPoint num="9" id="1570" />
+</COMPONENT>
+
+<COMPONENT type="5107" id="1587" >
 <cdparam x="356" y="841" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<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" />
-<TGConnectingPoint num="8" id="1568" />
-<TGConnectingPoint num="9" id="1569" />
-<TGConnectingPoint num="10" id="1570" />
-<TGConnectingPoint num="11" id="1571" />
-<TGConnectingPoint num="12" id="1572" />
-<TGConnectingPoint num="13" id="1573" />
-<TGConnectingPoint num="14" id="1574" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1616" >
+<TGConnectingPoint num="0" id="1572" />
+<TGConnectingPoint num="1" id="1573" />
+<TGConnectingPoint num="2" id="1574" />
+<TGConnectingPoint num="3" id="1575" />
+<TGConnectingPoint num="4" id="1576" />
+<TGConnectingPoint num="5" id="1577" />
+<TGConnectingPoint num="6" id="1578" />
+<TGConnectingPoint num="7" id="1579" />
+<TGConnectingPoint num="8" id="1580" />
+<TGConnectingPoint num="9" id="1581" />
+<TGConnectingPoint num="10" id="1582" />
+<TGConnectingPoint num="11" id="1583" />
+<TGConnectingPoint num="12" id="1584" />
+<TGConnectingPoint num="13" id="1585" />
+<TGConnectingPoint num="14" id="1586" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1628" >
 <cdparam x="316" y="747" />
 <sizeparam width="110" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="changeRate" />
-<TGConnectingPoint num="0" id="1576" />
-<TGConnectingPoint num="1" id="1577" />
-<TGConnectingPoint num="2" id="1578" />
-<TGConnectingPoint num="3" id="1579" />
-<TGConnectingPoint num="4" id="1580" />
-<TGConnectingPoint num="5" id="1581" />
-<TGConnectingPoint num="6" id="1582" />
-<TGConnectingPoint num="7" id="1583" />
-<TGConnectingPoint num="8" id="1584" />
-<TGConnectingPoint num="9" id="1585" />
-<TGConnectingPoint num="10" id="1586" />
-<TGConnectingPoint num="11" id="1587" />
-<TGConnectingPoint num="12" id="1588" />
-<TGConnectingPoint num="13" id="1589" />
-<TGConnectingPoint num="14" id="1590" />
-<TGConnectingPoint num="15" id="1591" />
-<TGConnectingPoint num="16" id="1592" />
-<TGConnectingPoint num="17" id="1593" />
-<TGConnectingPoint num="18" id="1594" />
-<TGConnectingPoint num="19" id="1595" />
-<TGConnectingPoint num="20" id="1596" />
-<TGConnectingPoint num="21" id="1597" />
-<TGConnectingPoint num="22" id="1598" />
-<TGConnectingPoint num="23" id="1599" />
-<TGConnectingPoint num="24" id="1600" />
-<TGConnectingPoint num="25" id="1601" />
-<TGConnectingPoint num="26" id="1602" />
-<TGConnectingPoint num="27" id="1603" />
-<TGConnectingPoint num="28" id="1604" />
-<TGConnectingPoint num="29" id="1605" />
-<TGConnectingPoint num="30" id="1606" />
-<TGConnectingPoint num="31" id="1607" />
-<TGConnectingPoint num="32" id="1608" />
-<TGConnectingPoint num="33" id="1609" />
-<TGConnectingPoint num="34" id="1610" />
-<TGConnectingPoint num="35" id="1611" />
-<TGConnectingPoint num="36" id="1612" />
-<TGConnectingPoint num="37" id="1613" />
-<TGConnectingPoint num="38" id="1614" />
-<TGConnectingPoint num="39" id="1615" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1657" >
+<TGConnectingPoint num="0" id="1588" />
+<TGConnectingPoint num="1" id="1589" />
+<TGConnectingPoint num="2" id="1590" />
+<TGConnectingPoint num="3" id="1591" />
+<TGConnectingPoint num="4" id="1592" />
+<TGConnectingPoint num="5" id="1593" />
+<TGConnectingPoint num="6" id="1594" />
+<TGConnectingPoint num="7" id="1595" />
+<TGConnectingPoint num="8" id="1596" />
+<TGConnectingPoint num="9" id="1597" />
+<TGConnectingPoint num="10" id="1598" />
+<TGConnectingPoint num="11" id="1599" />
+<TGConnectingPoint num="12" id="1600" />
+<TGConnectingPoint num="13" id="1601" />
+<TGConnectingPoint num="14" id="1602" />
+<TGConnectingPoint num="15" id="1603" />
+<TGConnectingPoint num="16" id="1604" />
+<TGConnectingPoint num="17" id="1605" />
+<TGConnectingPoint num="18" id="1606" />
+<TGConnectingPoint num="19" id="1607" />
+<TGConnectingPoint num="20" id="1608" />
+<TGConnectingPoint num="21" id="1609" />
+<TGConnectingPoint num="22" id="1610" />
+<TGConnectingPoint num="23" id="1611" />
+<TGConnectingPoint num="24" id="1612" />
+<TGConnectingPoint num="25" id="1613" />
+<TGConnectingPoint num="26" id="1614" />
+<TGConnectingPoint num="27" id="1615" />
+<TGConnectingPoint num="28" id="1616" />
+<TGConnectingPoint num="29" id="1617" />
+<TGConnectingPoint num="30" id="1618" />
+<TGConnectingPoint num="31" id="1619" />
+<TGConnectingPoint num="32" id="1620" />
+<TGConnectingPoint num="33" id="1621" />
+<TGConnectingPoint num="34" id="1622" />
+<TGConnectingPoint num="35" id="1623" />
+<TGConnectingPoint num="36" id="1624" />
+<TGConnectingPoint num="37" id="1625" />
+<TGConnectingPoint num="38" id="1626" />
+<TGConnectingPoint num="39" id="1627" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1669" >
 <cdparam x="289" y="423" />
 <sizeparam width="164" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="calculateDistance" />
-<TGConnectingPoint num="0" id="1617" />
-<TGConnectingPoint num="1" id="1618" />
-<TGConnectingPoint num="2" id="1619" />
-<TGConnectingPoint num="3" id="1620" />
-<TGConnectingPoint num="4" id="1621" />
-<TGConnectingPoint num="5" id="1622" />
-<TGConnectingPoint num="6" id="1623" />
-<TGConnectingPoint num="7" id="1624" />
-<TGConnectingPoint num="8" id="1625" />
-<TGConnectingPoint num="9" id="1626" />
-<TGConnectingPoint num="10" id="1627" />
-<TGConnectingPoint num="11" id="1628" />
-<TGConnectingPoint num="12" id="1629" />
-<TGConnectingPoint num="13" id="1630" />
-<TGConnectingPoint num="14" id="1631" />
-<TGConnectingPoint num="15" id="1632" />
-<TGConnectingPoint num="16" id="1633" />
-<TGConnectingPoint num="17" id="1634" />
-<TGConnectingPoint num="18" id="1635" />
-<TGConnectingPoint num="19" id="1636" />
-<TGConnectingPoint num="20" id="1637" />
-<TGConnectingPoint num="21" id="1638" />
-<TGConnectingPoint num="22" id="1639" />
-<TGConnectingPoint num="23" id="1640" />
-<TGConnectingPoint num="24" id="1641" />
-<TGConnectingPoint num="25" id="1642" />
-<TGConnectingPoint num="26" id="1643" />
-<TGConnectingPoint num="27" id="1644" />
-<TGConnectingPoint num="28" id="1645" />
-<TGConnectingPoint num="29" id="1646" />
-<TGConnectingPoint num="30" id="1647" />
-<TGConnectingPoint num="31" id="1648" />
-<TGConnectingPoint num="32" id="1649" />
-<TGConnectingPoint num="33" id="1650" />
-<TGConnectingPoint num="34" id="1651" />
-<TGConnectingPoint num="35" id="1652" />
-<TGConnectingPoint num="36" id="1653" />
-<TGConnectingPoint num="37" id="1654" />
-<TGConnectingPoint num="38" id="1655" />
-<TGConnectingPoint num="39" id="1656" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="1673" >
+<TGConnectingPoint num="0" id="1629" />
+<TGConnectingPoint num="1" id="1630" />
+<TGConnectingPoint num="2" id="1631" />
+<TGConnectingPoint num="3" id="1632" />
+<TGConnectingPoint num="4" id="1633" />
+<TGConnectingPoint num="5" id="1634" />
+<TGConnectingPoint num="6" id="1635" />
+<TGConnectingPoint num="7" id="1636" />
+<TGConnectingPoint num="8" id="1637" />
+<TGConnectingPoint num="9" id="1638" />
+<TGConnectingPoint num="10" id="1639" />
+<TGConnectingPoint num="11" id="1640" />
+<TGConnectingPoint num="12" id="1641" />
+<TGConnectingPoint num="13" id="1642" />
+<TGConnectingPoint num="14" id="1643" />
+<TGConnectingPoint num="15" id="1644" />
+<TGConnectingPoint num="16" id="1645" />
+<TGConnectingPoint num="17" id="1646" />
+<TGConnectingPoint num="18" id="1647" />
+<TGConnectingPoint num="19" id="1648" />
+<TGConnectingPoint num="20" id="1649" />
+<TGConnectingPoint num="21" id="1650" />
+<TGConnectingPoint num="22" id="1651" />
+<TGConnectingPoint num="23" id="1652" />
+<TGConnectingPoint num="24" id="1653" />
+<TGConnectingPoint num="25" id="1654" />
+<TGConnectingPoint num="26" id="1655" />
+<TGConnectingPoint num="27" id="1656" />
+<TGConnectingPoint num="28" id="1657" />
+<TGConnectingPoint num="29" id="1658" />
+<TGConnectingPoint num="30" id="1659" />
+<TGConnectingPoint num="31" id="1660" />
+<TGConnectingPoint num="32" id="1661" />
+<TGConnectingPoint num="33" id="1662" />
+<TGConnectingPoint num="34" id="1663" />
+<TGConnectingPoint num="35" id="1664" />
+<TGConnectingPoint num="36" id="1665" />
+<TGConnectingPoint num="37" id="1666" />
+<TGConnectingPoint num="38" id="1667" />
+<TGConnectingPoint num="39" id="1668" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="1685" >
 <cdparam x="381" y="260" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1658" />
-<TGConnectingPoint num="1" id="1659" />
-<TGConnectingPoint num="2" id="1660" />
-<TGConnectingPoint num="3" id="1661" />
-<TGConnectingPoint num="4" id="1662" />
-<TGConnectingPoint num="5" id="1663" />
-<TGConnectingPoint num="6" id="1664" />
-<TGConnectingPoint num="7" id="1665" />
-<TGConnectingPoint num="8" id="1666" />
-<TGConnectingPoint num="9" id="1667" />
-<TGConnectingPoint num="10" id="1668" />
-<TGConnectingPoint num="11" id="1669" />
-<TGConnectingPoint num="12" id="1670" />
-<TGConnectingPoint num="13" id="1671" />
-<TGConnectingPoint num="14" id="1672" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1714" >
+<TGConnectingPoint num="0" id="1670" />
+<TGConnectingPoint num="1" id="1671" />
+<TGConnectingPoint num="2" id="1672" />
+<TGConnectingPoint num="3" id="1673" />
+<TGConnectingPoint num="4" id="1674" />
+<TGConnectingPoint num="5" id="1675" />
+<TGConnectingPoint num="6" id="1676" />
+<TGConnectingPoint num="7" id="1677" />
+<TGConnectingPoint num="8" id="1678" />
+<TGConnectingPoint num="9" id="1679" />
+<TGConnectingPoint num="10" id="1680" />
+<TGConnectingPoint num="11" id="1681" />
+<TGConnectingPoint num="12" id="1682" />
+<TGConnectingPoint num="13" id="1683" />
+<TGConnectingPoint num="14" id="1684" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1726" >
 <cdparam x="424" y="291" />
 <sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="measureTemp" />
-<TGConnectingPoint num="0" id="1674" />
-<TGConnectingPoint num="1" id="1675" />
-<TGConnectingPoint num="2" id="1676" />
-<TGConnectingPoint num="3" id="1677" />
-<TGConnectingPoint num="4" id="1678" />
-<TGConnectingPoint num="5" id="1679" />
-<TGConnectingPoint num="6" id="1680" />
-<TGConnectingPoint num="7" id="1681" />
-<TGConnectingPoint num="8" id="1682" />
-<TGConnectingPoint num="9" id="1683" />
-<TGConnectingPoint num="10" id="1684" />
-<TGConnectingPoint num="11" id="1685" />
-<TGConnectingPoint num="12" id="1686" />
-<TGConnectingPoint num="13" id="1687" />
-<TGConnectingPoint num="14" id="1688" />
-<TGConnectingPoint num="15" id="1689" />
-<TGConnectingPoint num="16" id="1690" />
-<TGConnectingPoint num="17" id="1691" />
-<TGConnectingPoint num="18" id="1692" />
-<TGConnectingPoint num="19" id="1693" />
-<TGConnectingPoint num="20" id="1694" />
-<TGConnectingPoint num="21" id="1695" />
-<TGConnectingPoint num="22" id="1696" />
-<TGConnectingPoint num="23" id="1697" />
-<TGConnectingPoint num="24" id="1698" />
-<TGConnectingPoint num="25" id="1699" />
-<TGConnectingPoint num="26" id="1700" />
-<TGConnectingPoint num="27" id="1701" />
-<TGConnectingPoint num="28" id="1702" />
-<TGConnectingPoint num="29" id="1703" />
-<TGConnectingPoint num="30" id="1704" />
-<TGConnectingPoint num="31" id="1705" />
-<TGConnectingPoint num="32" id="1706" />
-<TGConnectingPoint num="33" id="1707" />
-<TGConnectingPoint num="34" id="1708" />
-<TGConnectingPoint num="35" id="1709" />
-<TGConnectingPoint num="36" id="1710" />
-<TGConnectingPoint num="37" id="1711" />
-<TGConnectingPoint num="38" id="1712" />
-<TGConnectingPoint num="39" id="1713" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1725" >
-<cdparam x="424" y="374" />
-<sizeparam width="121" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1686" />
+<TGConnectingPoint num="1" id="1687" />
+<TGConnectingPoint num="2" id="1688" />
+<TGConnectingPoint num="3" id="1689" />
+<TGConnectingPoint num="4" id="1690" />
+<TGConnectingPoint num="5" id="1691" />
+<TGConnectingPoint num="6" id="1692" />
+<TGConnectingPoint num="7" id="1693" />
+<TGConnectingPoint num="8" id="1694" />
+<TGConnectingPoint num="9" id="1695" />
+<TGConnectingPoint num="10" id="1696" />
+<TGConnectingPoint num="11" id="1697" />
+<TGConnectingPoint num="12" id="1698" />
+<TGConnectingPoint num="13" id="1699" />
+<TGConnectingPoint num="14" id="1700" />
+<TGConnectingPoint num="15" id="1701" />
+<TGConnectingPoint num="16" id="1702" />
+<TGConnectingPoint num="17" id="1703" />
+<TGConnectingPoint num="18" id="1704" />
+<TGConnectingPoint num="19" id="1705" />
+<TGConnectingPoint num="20" id="1706" />
+<TGConnectingPoint num="21" id="1707" />
+<TGConnectingPoint num="22" id="1708" />
+<TGConnectingPoint num="23" id="1709" />
+<TGConnectingPoint num="24" id="1710" />
+<TGConnectingPoint num="25" id="1711" />
+<TGConnectingPoint num="26" id="1712" />
+<TGConnectingPoint num="27" id="1713" />
+<TGConnectingPoint num="28" id="1714" />
+<TGConnectingPoint num="29" id="1715" />
+<TGConnectingPoint num="30" id="1716" />
+<TGConnectingPoint num="31" id="1717" />
+<TGConnectingPoint num="32" id="1718" />
+<TGConnectingPoint num="33" id="1719" />
+<TGConnectingPoint num="34" id="1720" />
+<TGConnectingPoint num="35" id="1721" />
+<TGConnectingPoint num="36" id="1722" />
+<TGConnectingPoint num="37" id="1723" />
+<TGConnectingPoint num="38" id="1724" />
+<TGConnectingPoint num="39" id="1725" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1737" >
+<cdparam x="423" y="374" />
+<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Receive signal" value="tempData(temp)" />
-<TGConnectingPoint num="0" id="1715" />
-<TGConnectingPoint num="1" id="1716" />
-<TGConnectingPoint num="2" id="1717" />
-<TGConnectingPoint num="3" id="1718" />
-<TGConnectingPoint num="4" id="1719" />
-<TGConnectingPoint num="5" id="1720" />
-<TGConnectingPoint num="6" id="1721" />
-<TGConnectingPoint num="7" id="1722" />
-<TGConnectingPoint num="8" id="1723" />
-<TGConnectingPoint num="9" id="1724" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1766" >
+<TGConnectingPoint num="0" id="1727" />
+<TGConnectingPoint num="1" id="1728" />
+<TGConnectingPoint num="2" id="1729" />
+<TGConnectingPoint num="3" id="1730" />
+<TGConnectingPoint num="4" id="1731" />
+<TGConnectingPoint num="5" id="1732" />
+<TGConnectingPoint num="6" id="1733" />
+<TGConnectingPoint num="7" id="1734" />
+<TGConnectingPoint num="8" id="1735" />
+<TGConnectingPoint num="9" id="1736" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1778" >
 <cdparam x="480" y="553" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="state1" />
-<TGConnectingPoint num="0" id="1726" />
-<TGConnectingPoint num="1" id="1727" />
-<TGConnectingPoint num="2" id="1728" />
-<TGConnectingPoint num="3" id="1729" />
-<TGConnectingPoint num="4" id="1730" />
-<TGConnectingPoint num="5" id="1731" />
-<TGConnectingPoint num="6" id="1732" />
-<TGConnectingPoint num="7" id="1733" />
-<TGConnectingPoint num="8" id="1734" />
-<TGConnectingPoint num="9" id="1735" />
-<TGConnectingPoint num="10" id="1736" />
-<TGConnectingPoint num="11" id="1737" />
-<TGConnectingPoint num="12" id="1738" />
-<TGConnectingPoint num="13" id="1739" />
-<TGConnectingPoint num="14" id="1740" />
-<TGConnectingPoint num="15" id="1741" />
-<TGConnectingPoint num="16" id="1742" />
-<TGConnectingPoint num="17" id="1743" />
-<TGConnectingPoint num="18" id="1744" />
-<TGConnectingPoint num="19" id="1745" />
-<TGConnectingPoint num="20" id="1746" />
-<TGConnectingPoint num="21" id="1747" />
-<TGConnectingPoint num="22" id="1748" />
-<TGConnectingPoint num="23" id="1749" />
-<TGConnectingPoint num="24" id="1750" />
-<TGConnectingPoint num="25" id="1751" />
-<TGConnectingPoint num="26" id="1752" />
-<TGConnectingPoint num="27" id="1753" />
-<TGConnectingPoint num="28" id="1754" />
-<TGConnectingPoint num="29" id="1755" />
-<TGConnectingPoint num="30" id="1756" />
-<TGConnectingPoint num="31" id="1757" />
-<TGConnectingPoint num="32" id="1758" />
-<TGConnectingPoint num="33" id="1759" />
-<TGConnectingPoint num="34" id="1760" />
-<TGConnectingPoint num="35" id="1761" />
-<TGConnectingPoint num="36" id="1762" />
-<TGConnectingPoint num="37" id="1763" />
-<TGConnectingPoint num="38" id="1764" />
-<TGConnectingPoint num="39" id="1765" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1807" >
+<TGConnectingPoint num="0" id="1738" />
+<TGConnectingPoint num="1" id="1739" />
+<TGConnectingPoint num="2" id="1740" />
+<TGConnectingPoint num="3" id="1741" />
+<TGConnectingPoint num="4" id="1742" />
+<TGConnectingPoint num="5" id="1743" />
+<TGConnectingPoint num="6" id="1744" />
+<TGConnectingPoint num="7" id="1745" />
+<TGConnectingPoint num="8" id="1746" />
+<TGConnectingPoint num="9" id="1747" />
+<TGConnectingPoint num="10" id="1748" />
+<TGConnectingPoint num="11" id="1749" />
+<TGConnectingPoint num="12" id="1750" />
+<TGConnectingPoint num="13" id="1751" />
+<TGConnectingPoint num="14" id="1752" />
+<TGConnectingPoint num="15" id="1753" />
+<TGConnectingPoint num="16" id="1754" />
+<TGConnectingPoint num="17" id="1755" />
+<TGConnectingPoint num="18" id="1756" />
+<TGConnectingPoint num="19" id="1757" />
+<TGConnectingPoint num="20" id="1758" />
+<TGConnectingPoint num="21" id="1759" />
+<TGConnectingPoint num="22" id="1760" />
+<TGConnectingPoint num="23" id="1761" />
+<TGConnectingPoint num="24" id="1762" />
+<TGConnectingPoint num="25" id="1763" />
+<TGConnectingPoint num="26" id="1764" />
+<TGConnectingPoint num="27" id="1765" />
+<TGConnectingPoint num="28" id="1766" />
+<TGConnectingPoint num="29" id="1767" />
+<TGConnectingPoint num="30" id="1768" />
+<TGConnectingPoint num="31" id="1769" />
+<TGConnectingPoint num="32" id="1770" />
+<TGConnectingPoint num="33" id="1771" />
+<TGConnectingPoint num="34" id="1772" />
+<TGConnectingPoint num="35" id="1773" />
+<TGConnectingPoint num="36" id="1774" />
+<TGConnectingPoint num="37" id="1775" />
+<TGConnectingPoint num="38" id="1776" />
+<TGConnectingPoint num="39" id="1777" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1819" >
 <cdparam x="321" y="587" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="state2" />
-<TGConnectingPoint num="0" id="1767" />
-<TGConnectingPoint num="1" id="1768" />
-<TGConnectingPoint num="2" id="1769" />
-<TGConnectingPoint num="3" id="1770" />
-<TGConnectingPoint num="4" id="1771" />
-<TGConnectingPoint num="5" id="1772" />
-<TGConnectingPoint num="6" id="1773" />
-<TGConnectingPoint num="7" id="1774" />
-<TGConnectingPoint num="8" id="1775" />
-<TGConnectingPoint num="9" id="1776" />
-<TGConnectingPoint num="10" id="1777" />
-<TGConnectingPoint num="11" id="1778" />
-<TGConnectingPoint num="12" id="1779" />
-<TGConnectingPoint num="13" id="1780" />
-<TGConnectingPoint num="14" id="1781" />
-<TGConnectingPoint num="15" id="1782" />
-<TGConnectingPoint num="16" id="1783" />
-<TGConnectingPoint num="17" id="1784" />
-<TGConnectingPoint num="18" id="1785" />
-<TGConnectingPoint num="19" id="1786" />
-<TGConnectingPoint num="20" id="1787" />
-<TGConnectingPoint num="21" id="1788" />
-<TGConnectingPoint num="22" id="1789" />
-<TGConnectingPoint num="23" id="1790" />
-<TGConnectingPoint num="24" id="1791" />
-<TGConnectingPoint num="25" id="1792" />
-<TGConnectingPoint num="26" id="1793" />
-<TGConnectingPoint num="27" id="1794" />
-<TGConnectingPoint num="28" id="1795" />
-<TGConnectingPoint num="29" id="1796" />
-<TGConnectingPoint num="30" id="1797" />
-<TGConnectingPoint num="31" id="1798" />
-<TGConnectingPoint num="32" id="1799" />
-<TGConnectingPoint num="33" id="1800" />
-<TGConnectingPoint num="34" id="1801" />
-<TGConnectingPoint num="35" id="1802" />
-<TGConnectingPoint num="36" id="1803" />
-<TGConnectingPoint num="37" id="1804" />
-<TGConnectingPoint num="38" id="1805" />
-<TGConnectingPoint num="39" id="1806" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1848" >
+<TGConnectingPoint num="0" id="1779" />
+<TGConnectingPoint num="1" id="1780" />
+<TGConnectingPoint num="2" id="1781" />
+<TGConnectingPoint num="3" id="1782" />
+<TGConnectingPoint num="4" id="1783" />
+<TGConnectingPoint num="5" id="1784" />
+<TGConnectingPoint num="6" id="1785" />
+<TGConnectingPoint num="7" id="1786" />
+<TGConnectingPoint num="8" id="1787" />
+<TGConnectingPoint num="9" id="1788" />
+<TGConnectingPoint num="10" id="1789" />
+<TGConnectingPoint num="11" id="1790" />
+<TGConnectingPoint num="12" id="1791" />
+<TGConnectingPoint num="13" id="1792" />
+<TGConnectingPoint num="14" id="1793" />
+<TGConnectingPoint num="15" id="1794" />
+<TGConnectingPoint num="16" id="1795" />
+<TGConnectingPoint num="17" id="1796" />
+<TGConnectingPoint num="18" id="1797" />
+<TGConnectingPoint num="19" id="1798" />
+<TGConnectingPoint num="20" id="1799" />
+<TGConnectingPoint num="21" id="1800" />
+<TGConnectingPoint num="22" id="1801" />
+<TGConnectingPoint num="23" id="1802" />
+<TGConnectingPoint num="24" id="1803" />
+<TGConnectingPoint num="25" id="1804" />
+<TGConnectingPoint num="26" id="1805" />
+<TGConnectingPoint num="27" id="1806" />
+<TGConnectingPoint num="28" id="1807" />
+<TGConnectingPoint num="29" id="1808" />
+<TGConnectingPoint num="30" id="1809" />
+<TGConnectingPoint num="31" id="1810" />
+<TGConnectingPoint num="32" id="1811" />
+<TGConnectingPoint num="33" id="1812" />
+<TGConnectingPoint num="34" id="1813" />
+<TGConnectingPoint num="35" id="1814" />
+<TGConnectingPoint num="36" id="1815" />
+<TGConnectingPoint num="37" id="1816" />
+<TGConnectingPoint num="38" id="1817" />
+<TGConnectingPoint num="39" id="1818" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1860" >
 <cdparam x="183" y="558" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="state0" />
-<TGConnectingPoint num="0" id="1808" />
-<TGConnectingPoint num="1" id="1809" />
-<TGConnectingPoint num="2" id="1810" />
-<TGConnectingPoint num="3" id="1811" />
-<TGConnectingPoint num="4" id="1812" />
-<TGConnectingPoint num="5" id="1813" />
-<TGConnectingPoint num="6" id="1814" />
-<TGConnectingPoint num="7" id="1815" />
-<TGConnectingPoint num="8" id="1816" />
-<TGConnectingPoint num="9" id="1817" />
-<TGConnectingPoint num="10" id="1818" />
-<TGConnectingPoint num="11" id="1819" />
-<TGConnectingPoint num="12" id="1820" />
-<TGConnectingPoint num="13" id="1821" />
-<TGConnectingPoint num="14" id="1822" />
-<TGConnectingPoint num="15" id="1823" />
-<TGConnectingPoint num="16" id="1824" />
-<TGConnectingPoint num="17" id="1825" />
-<TGConnectingPoint num="18" id="1826" />
-<TGConnectingPoint num="19" id="1827" />
-<TGConnectingPoint num="20" id="1828" />
-<TGConnectingPoint num="21" id="1829" />
-<TGConnectingPoint num="22" id="1830" />
-<TGConnectingPoint num="23" id="1831" />
-<TGConnectingPoint num="24" id="1832" />
-<TGConnectingPoint num="25" id="1833" />
-<TGConnectingPoint num="26" id="1834" />
-<TGConnectingPoint num="27" id="1835" />
-<TGConnectingPoint num="28" id="1836" />
-<TGConnectingPoint num="29" id="1837" />
-<TGConnectingPoint num="30" id="1838" />
-<TGConnectingPoint num="31" id="1839" />
-<TGConnectingPoint num="32" id="1840" />
-<TGConnectingPoint num="33" id="1841" />
-<TGConnectingPoint num="34" id="1842" />
-<TGConnectingPoint num="35" id="1843" />
-<TGConnectingPoint num="36" id="1844" />
-<TGConnectingPoint num="37" id="1845" />
-<TGConnectingPoint num="38" id="1846" />
-<TGConnectingPoint num="39" id="1847" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5107" id="1864" >
+<TGConnectingPoint num="0" id="1820" />
+<TGConnectingPoint num="1" id="1821" />
+<TGConnectingPoint num="2" id="1822" />
+<TGConnectingPoint num="3" id="1823" />
+<TGConnectingPoint num="4" id="1824" />
+<TGConnectingPoint num="5" id="1825" />
+<TGConnectingPoint num="6" id="1826" />
+<TGConnectingPoint num="7" id="1827" />
+<TGConnectingPoint num="8" id="1828" />
+<TGConnectingPoint num="9" id="1829" />
+<TGConnectingPoint num="10" id="1830" />
+<TGConnectingPoint num="11" id="1831" />
+<TGConnectingPoint num="12" id="1832" />
+<TGConnectingPoint num="13" id="1833" />
+<TGConnectingPoint num="14" id="1834" />
+<TGConnectingPoint num="15" id="1835" />
+<TGConnectingPoint num="16" id="1836" />
+<TGConnectingPoint num="17" id="1837" />
+<TGConnectingPoint num="18" id="1838" />
+<TGConnectingPoint num="19" id="1839" />
+<TGConnectingPoint num="20" id="1840" />
+<TGConnectingPoint num="21" id="1841" />
+<TGConnectingPoint num="22" id="1842" />
+<TGConnectingPoint num="23" id="1843" />
+<TGConnectingPoint num="24" id="1844" />
+<TGConnectingPoint num="25" id="1845" />
+<TGConnectingPoint num="26" id="1846" />
+<TGConnectingPoint num="27" id="1847" />
+<TGConnectingPoint num="28" id="1848" />
+<TGConnectingPoint num="29" id="1849" />
+<TGConnectingPoint num="30" id="1850" />
+<TGConnectingPoint num="31" id="1851" />
+<TGConnectingPoint num="32" id="1852" />
+<TGConnectingPoint num="33" id="1853" />
+<TGConnectingPoint num="34" id="1854" />
+<TGConnectingPoint num="35" id="1855" />
+<TGConnectingPoint num="36" id="1856" />
+<TGConnectingPoint num="37" id="1857" />
+<TGConnectingPoint num="38" id="1858" />
+<TGConnectingPoint num="39" id="1859" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5107" id="1876" >
 <cdparam x="356" y="509" />
 <sizeparam width="30" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="choice" value="null" />
-<TGConnectingPoint num="0" id="1849" />
-<TGConnectingPoint num="1" id="1850" />
-<TGConnectingPoint num="2" id="1851" />
-<TGConnectingPoint num="3" id="1852" />
-<TGConnectingPoint num="4" id="1853" />
-<TGConnectingPoint num="5" id="1854" />
-<TGConnectingPoint num="6" id="1855" />
-<TGConnectingPoint num="7" id="1856" />
-<TGConnectingPoint num="8" id="1857" />
-<TGConnectingPoint num="9" id="1858" />
-<TGConnectingPoint num="10" id="1859" />
-<TGConnectingPoint num="11" id="1860" />
-<TGConnectingPoint num="12" id="1861" />
-<TGConnectingPoint num="13" id="1862" />
-<TGConnectingPoint num="14" id="1863" />
-</COMPONENT>
-
-<COMPONENT type="5104" id="1875" >
-<cdparam x="220" y="192" />
-<sizeparam width="350" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1861" />
+<TGConnectingPoint num="1" id="1862" />
+<TGConnectingPoint num="2" id="1863" />
+<TGConnectingPoint num="3" id="1864" />
+<TGConnectingPoint num="4" id="1865" />
+<TGConnectingPoint num="5" id="1866" />
+<TGConnectingPoint num="6" id="1867" />
+<TGConnectingPoint num="7" id="1868" />
+<TGConnectingPoint num="8" id="1869" />
+<TGConnectingPoint num="9" id="1870" />
+<TGConnectingPoint num="10" id="1871" />
+<TGConnectingPoint num="11" id="1872" />
+<TGConnectingPoint num="12" id="1873" />
+<TGConnectingPoint num="13" id="1874" />
+<TGConnectingPoint num="14" id="1875" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="1887" >
+<cdparam x="216" y="192" />
+<sizeparam width="358" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Receive signal" value="sensorData(distanceLeft, distanceFront, distanceLeft)" />
-<TGConnectingPoint num="0" id="1865" />
-<TGConnectingPoint num="1" id="1866" />
-<TGConnectingPoint num="2" id="1867" />
-<TGConnectingPoint num="3" id="1868" />
-<TGConnectingPoint num="4" id="1869" />
-<TGConnectingPoint num="5" id="1870" />
-<TGConnectingPoint num="6" id="1871" />
-<TGConnectingPoint num="7" id="1872" />
-<TGConnectingPoint num="8" id="1873" />
-<TGConnectingPoint num="9" id="1874" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1916" >
+<TGConnectingPoint num="0" id="1877" />
+<TGConnectingPoint num="1" id="1878" />
+<TGConnectingPoint num="2" id="1879" />
+<TGConnectingPoint num="3" id="1880" />
+<TGConnectingPoint num="4" id="1881" />
+<TGConnectingPoint num="5" id="1882" />
+<TGConnectingPoint num="6" id="1883" />
+<TGConnectingPoint num="7" id="1884" />
+<TGConnectingPoint num="8" id="1885" />
+<TGConnectingPoint num="9" id="1886" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1928" >
 <cdparam x="313" y="112" />
 <sizeparam width="165" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="State" value="startController" />
-<TGConnectingPoint num="0" id="1876" />
-<TGConnectingPoint num="1" id="1877" />
-<TGConnectingPoint num="2" id="1878" />
-<TGConnectingPoint num="3" id="1879" />
-<TGConnectingPoint num="4" id="1880" />
-<TGConnectingPoint num="5" id="1881" />
-<TGConnectingPoint num="6" id="1882" />
-<TGConnectingPoint num="7" id="1883" />
-<TGConnectingPoint num="8" id="1884" />
-<TGConnectingPoint num="9" id="1885" />
-<TGConnectingPoint num="10" id="1886" />
-<TGConnectingPoint num="11" id="1887" />
-<TGConnectingPoint num="12" id="1888" />
-<TGConnectingPoint num="13" id="1889" />
-<TGConnectingPoint num="14" id="1890" />
-<TGConnectingPoint num="15" id="1891" />
-<TGConnectingPoint num="16" id="1892" />
-<TGConnectingPoint num="17" id="1893" />
-<TGConnectingPoint num="18" id="1894" />
-<TGConnectingPoint num="19" id="1895" />
-<TGConnectingPoint num="20" id="1896" />
-<TGConnectingPoint num="21" id="1897" />
-<TGConnectingPoint num="22" id="1898" />
-<TGConnectingPoint num="23" id="1899" />
-<TGConnectingPoint num="24" id="1900" />
-<TGConnectingPoint num="25" id="1901" />
-<TGConnectingPoint num="26" id="1902" />
-<TGConnectingPoint num="27" id="1903" />
-<TGConnectingPoint num="28" id="1904" />
-<TGConnectingPoint num="29" id="1905" />
-<TGConnectingPoint num="30" id="1906" />
-<TGConnectingPoint num="31" id="1907" />
-<TGConnectingPoint num="32" id="1908" />
-<TGConnectingPoint num="33" id="1909" />
-<TGConnectingPoint num="34" id="1910" />
-<TGConnectingPoint num="35" id="1911" />
-<TGConnectingPoint num="36" id="1912" />
-<TGConnectingPoint num="37" id="1913" />
-<TGConnectingPoint num="38" id="1914" />
-<TGConnectingPoint num="39" id="1915" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1918" >
+<TGConnectingPoint num="0" id="1888" />
+<TGConnectingPoint num="1" id="1889" />
+<TGConnectingPoint num="2" id="1890" />
+<TGConnectingPoint num="3" id="1891" />
+<TGConnectingPoint num="4" id="1892" />
+<TGConnectingPoint num="5" id="1893" />
+<TGConnectingPoint num="6" id="1894" />
+<TGConnectingPoint num="7" id="1895" />
+<TGConnectingPoint num="8" id="1896" />
+<TGConnectingPoint num="9" id="1897" />
+<TGConnectingPoint num="10" id="1898" />
+<TGConnectingPoint num="11" id="1899" />
+<TGConnectingPoint num="12" id="1900" />
+<TGConnectingPoint num="13" id="1901" />
+<TGConnectingPoint num="14" id="1902" />
+<TGConnectingPoint num="15" id="1903" />
+<TGConnectingPoint num="16" id="1904" />
+<TGConnectingPoint num="17" id="1905" />
+<TGConnectingPoint num="18" id="1906" />
+<TGConnectingPoint num="19" id="1907" />
+<TGConnectingPoint num="20" id="1908" />
+<TGConnectingPoint num="21" id="1909" />
+<TGConnectingPoint num="22" id="1910" />
+<TGConnectingPoint num="23" id="1911" />
+<TGConnectingPoint num="24" id="1912" />
+<TGConnectingPoint num="25" id="1913" />
+<TGConnectingPoint num="26" id="1914" />
+<TGConnectingPoint num="27" id="1915" />
+<TGConnectingPoint num="28" id="1916" />
+<TGConnectingPoint num="29" id="1917" />
+<TGConnectingPoint num="30" id="1918" />
+<TGConnectingPoint num="31" id="1919" />
+<TGConnectingPoint num="32" id="1920" />
+<TGConnectingPoint num="33" id="1921" />
+<TGConnectingPoint num="34" id="1922" />
+<TGConnectingPoint num="35" id="1923" />
+<TGConnectingPoint num="36" id="1924" />
+<TGConnectingPoint num="37" id="1925" />
+<TGConnectingPoint num="38" id="1926" />
+<TGConnectingPoint num="39" id="1927" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1930" >
 <cdparam x="388" y="55" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1917" />
+<TGConnectingPoint num="0" id="1929" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1929" >
-<cdparam x="402" y="1143" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1941" >
+<cdparam x="401" y="1143" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Send signal" value="control(sensorOn)" />
-<TGConnectingPoint num="0" id="1919" />
-<TGConnectingPoint num="1" id="1920" />
-<TGConnectingPoint num="2" id="1921" />
-<TGConnectingPoint num="3" id="1922" />
-<TGConnectingPoint num="4" id="1923" />
-<TGConnectingPoint num="5" id="1924" />
-<TGConnectingPoint num="6" id="1925" />
-<TGConnectingPoint num="7" id="1926" />
-<TGConnectingPoint num="8" id="1927" />
-<TGConnectingPoint num="9" id="1928" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1940" >
-<cdparam x="189" y="1147" />
-<sizeparam width="122" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<TGConnectingPoint num="0" id="1931" />
+<TGConnectingPoint num="1" id="1932" />
+<TGConnectingPoint num="2" id="1933" />
+<TGConnectingPoint num="3" id="1934" />
+<TGConnectingPoint num="4" id="1935" />
+<TGConnectingPoint num="5" id="1936" />
+<TGConnectingPoint num="6" id="1937" />
+<TGConnectingPoint num="7" id="1938" />
+<TGConnectingPoint num="8" id="1939" />
+<TGConnectingPoint num="9" id="1940" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1952" >
+<cdparam x="188" y="1147" />
+<sizeparam width="124" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="Send signal" value="control(sensorOn)" />
-<TGConnectingPoint num="0" id="1930" />
-<TGConnectingPoint num="1" id="1931" />
-<TGConnectingPoint num="2" id="1932" />
-<TGConnectingPoint num="3" id="1933" />
-<TGConnectingPoint num="4" id="1934" />
-<TGConnectingPoint num="5" id="1935" />
-<TGConnectingPoint num="6" id="1936" />
-<TGConnectingPoint num="7" id="1937" />
-<TGConnectingPoint num="8" id="1938" />
-<TGConnectingPoint num="9" id="1939" />
+<TGConnectingPoint num="0" id="1942" />
+<TGConnectingPoint num="1" id="1943" />
+<TGConnectingPoint num="2" id="1944" />
+<TGConnectingPoint num="3" id="1945" />
+<TGConnectingPoint num="4" id="1946" />
+<TGConnectingPoint num="5" id="1947" />
+<TGConnectingPoint num="6" id="1948" />
+<TGConnectingPoint num="7" id="1949" />
+<TGConnectingPoint num="8" id="1950" />
+<TGConnectingPoint num="9" id="1951" />
 </COMPONENT>
 
 
@@ -5417,311 +5482,311 @@ state 2: obstacles in close proximity
 
 <Modeling type="ADD" nameTab="Deployment" >
 <ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5353" id="1965" >
+<COMPONENT type="5353" id="1977" >
 <cdparam x="460" y="187" />
 <sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="1941" />
-<TGConnectingPoint num="1" id="1942" />
-<TGConnectingPoint num="2" id="1943" />
-<TGConnectingPoint num="3" id="1944" />
-<TGConnectingPoint num="4" id="1945" />
-<TGConnectingPoint num="5" id="1946" />
-<TGConnectingPoint num="6" id="1947" />
-<TGConnectingPoint num="7" id="1948" />
-<TGConnectingPoint num="8" id="1949" />
-<TGConnectingPoint num="9" id="1950" />
-<TGConnectingPoint num="10" id="1951" />
-<TGConnectingPoint num="11" id="1952" />
-<TGConnectingPoint num="12" id="1953" />
-<TGConnectingPoint num="13" id="1954" />
-<TGConnectingPoint num="14" id="1955" />
-<TGConnectingPoint num="15" id="1956" />
-<TGConnectingPoint num="16" id="1957" />
-<TGConnectingPoint num="17" id="1958" />
-<TGConnectingPoint num="18" id="1959" />
-<TGConnectingPoint num="19" id="1960" />
-<TGConnectingPoint num="20" id="1961" />
-<TGConnectingPoint num="21" id="1962" />
-<TGConnectingPoint num="22" id="1963" />
-<TGConnectingPoint num="23" id="1964" />
+<TGConnectingPoint num="0" id="1953" />
+<TGConnectingPoint num="1" id="1954" />
+<TGConnectingPoint num="2" id="1955" />
+<TGConnectingPoint num="3" id="1956" />
+<TGConnectingPoint num="4" id="1957" />
+<TGConnectingPoint num="5" id="1958" />
+<TGConnectingPoint num="6" id="1959" />
+<TGConnectingPoint num="7" id="1960" />
+<TGConnectingPoint num="8" id="1961" />
+<TGConnectingPoint num="9" id="1962" />
+<TGConnectingPoint num="10" id="1963" />
+<TGConnectingPoint num="11" id="1964" />
+<TGConnectingPoint num="12" id="1965" />
+<TGConnectingPoint num="13" id="1966" />
+<TGConnectingPoint num="14" id="1967" />
+<TGConnectingPoint num="15" id="1968" />
+<TGConnectingPoint num="16" id="1969" />
+<TGConnectingPoint num="17" id="1970" />
+<TGConnectingPoint num="18" id="1971" />
+<TGConnectingPoint num="19" id="1972" />
+<TGConnectingPoint num="20" id="1973" />
+<TGConnectingPoint num="21" id="1974" />
+<TGConnectingPoint num="22" id="1975" />
+<TGConnectingPoint num="23" id="1976" />
 <extraparam>
 <info stereotype="VGSB" nodeName="Bus0" />
 <attributes index="0"  nbOfAttachedInitiators="0"  nbOfAttachedTargets="0"  minLatency="0"  fifoDepth="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5355" id="2017" >
+<COMPONENT type="5355" id="2029" >
 <cdparam x="797" y="112" />
 <sizeparam width="323" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="Memory0" value="name" />
-<TGConnectingPoint num="0" id="1993" />
-<TGConnectingPoint num="1" id="1994" />
-<TGConnectingPoint num="2" id="1995" />
-<TGConnectingPoint num="3" id="1996" />
-<TGConnectingPoint num="4" id="1997" />
-<TGConnectingPoint num="5" id="1998" />
-<TGConnectingPoint num="6" id="1999" />
-<TGConnectingPoint num="7" id="2000" />
-<TGConnectingPoint num="8" id="2001" />
-<TGConnectingPoint num="9" id="2002" />
-<TGConnectingPoint num="10" id="2003" />
-<TGConnectingPoint num="11" id="2004" />
-<TGConnectingPoint num="12" id="2005" />
-<TGConnectingPoint num="13" id="2006" />
-<TGConnectingPoint num="14" id="2007" />
-<TGConnectingPoint num="15" id="2008" />
-<TGConnectingPoint num="16" id="2009" />
-<TGConnectingPoint num="17" id="2010" />
-<TGConnectingPoint num="18" id="2011" />
-<TGConnectingPoint num="19" id="2012" />
-<TGConnectingPoint num="20" id="2013" />
-<TGConnectingPoint num="21" id="2014" />
-<TGConnectingPoint num="22" id="2015" />
-<TGConnectingPoint num="23" id="2016" />
+<TGConnectingPoint num="0" id="2005" />
+<TGConnectingPoint num="1" id="2006" />
+<TGConnectingPoint num="2" id="2007" />
+<TGConnectingPoint num="3" id="2008" />
+<TGConnectingPoint num="4" id="2009" />
+<TGConnectingPoint num="5" id="2010" />
+<TGConnectingPoint num="6" id="2011" />
+<TGConnectingPoint num="7" id="2012" />
+<TGConnectingPoint num="8" id="2013" />
+<TGConnectingPoint num="9" id="2014" />
+<TGConnectingPoint num="10" id="2015" />
+<TGConnectingPoint num="11" id="2016" />
+<TGConnectingPoint num="12" id="2017" />
+<TGConnectingPoint num="13" id="2018" />
+<TGConnectingPoint num="14" id="2019" />
+<TGConnectingPoint num="15" id="2020" />
+<TGConnectingPoint num="16" id="2021" />
+<TGConnectingPoint num="17" id="2022" />
+<TGConnectingPoint num="18" id="2023" />
+<TGConnectingPoint num="19" id="2024" />
+<TGConnectingPoint num="20" id="2025" />
+<TGConnectingPoint num="21" id="2026" />
+<TGConnectingPoint num="22" id="2027" />
+<TGConnectingPoint num="23" id="2028" />
 <extraparam>
 <info stereotype="RAM" nodeName="Memory0" />
 <attributes byteDataSize="1048576"  index="0" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5362" id="1974" >
-<father id="2017" num="0" />
+<SUBCOMPONENT type="5362" id="1986" >
+<father id="2029" num="0" />
 <cdparam x="868" y="250" />
-<sizeparam width="188" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="190" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="135" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="MainControl/in tempData" />
-<TGConnectingPoint num="0" id="1966" />
-<TGConnectingPoint num="1" id="1967" />
-<TGConnectingPoint num="2" id="1968" />
-<TGConnectingPoint num="3" id="1969" />
-<TGConnectingPoint num="4" id="1970" />
-<TGConnectingPoint num="5" id="1971" />
-<TGConnectingPoint num="6" id="1972" />
-<TGConnectingPoint num="7" id="1973" />
+<TGConnectingPoint num="0" id="1978" />
+<TGConnectingPoint num="1" id="1979" />
+<TGConnectingPoint num="2" id="1980" />
+<TGConnectingPoint num="3" id="1981" />
+<TGConnectingPoint num="4" id="1982" />
+<TGConnectingPoint num="5" id="1983" />
+<TGConnectingPoint num="6" id="1984" />
+<TGConnectingPoint num="7" id="1985" />
 <extraparam>
 <info value="MainControl/in tempData" channelName="MainControl/in tempData(int temp) #--# TemperatureSensor/out tempData(int temp)" fullChannelName="Design::MainControl/in tempData(int temp) #--# TemperatureSensor/out tempData(int temp)" referenceDiagram="Design" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5362" id="1983" >
-<father id="2017" num="1" />
+<SUBCOMPONENT type="5362" id="1995" >
+<father id="2029" num="1" />
 <cdparam x="845" y="201" />
-<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="237" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="88" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="86" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="MainControl/out motorCommand" />
-<TGConnectingPoint num="0" id="1975" />
-<TGConnectingPoint num="1" id="1976" />
-<TGConnectingPoint num="2" id="1977" />
-<TGConnectingPoint num="3" id="1978" />
-<TGConnectingPoint num="4" id="1979" />
-<TGConnectingPoint num="5" id="1980" />
-<TGConnectingPoint num="6" id="1981" />
-<TGConnectingPoint num="7" id="1982" />
+<TGConnectingPoint num="0" id="1987" />
+<TGConnectingPoint num="1" id="1988" />
+<TGConnectingPoint num="2" id="1989" />
+<TGConnectingPoint num="3" id="1990" />
+<TGConnectingPoint num="4" id="1991" />
+<TGConnectingPoint num="5" id="1992" />
+<TGConnectingPoint num="6" id="1993" />
+<TGConnectingPoint num="7" id="1994" />
 <extraparam>
 <info value="MainControl/out motorCommand" channelName="MainControl/out motorCommand(int leftVelocity, int rightVelocity) #--# MotorControl/in motorCommand(int leftCommand, int rightCommand)" fullChannelName="Design::MainControl/out motorCommand(int leftVelocity, int rightVelocity) #--# MotorControl/in motorCommand(int leftCommand, int rightCommand)" referenceDiagram="Design" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5362" id="1992" >
-<father id="2017" num="2" />
+<SUBCOMPONENT type="5362" id="2004" >
+<father id="2029" num="2" />
 <cdparam x="862" y="154" />
-<sizeparam width="198" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="201" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="125" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="122" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="MainControl/in sensorData" />
-<TGConnectingPoint num="0" id="1984" />
-<TGConnectingPoint num="1" id="1985" />
-<TGConnectingPoint num="2" id="1986" />
-<TGConnectingPoint num="3" id="1987" />
-<TGConnectingPoint num="4" id="1988" />
-<TGConnectingPoint num="5" id="1989" />
-<TGConnectingPoint num="6" id="1990" />
-<TGConnectingPoint num="7" id="1991" />
+<TGConnectingPoint num="0" id="1996" />
+<TGConnectingPoint num="1" id="1997" />
+<TGConnectingPoint num="2" id="1998" />
+<TGConnectingPoint num="3" id="1999" />
+<TGConnectingPoint num="4" id="2000" />
+<TGConnectingPoint num="5" id="2001" />
+<TGConnectingPoint num="6" id="2002" />
+<TGConnectingPoint num="7" id="2003" />
 <extraparam>
 <info value="MainControl/in sensorData" channelName="MainControl/in sensorData(int distanceLeft, int distanceFront, int distanceRight) #--# DistanceSensor/out sensorData(int distanceLeft, int distanceFront, int distanceRight)" fullChannelName="Design::MainControl/in sensorData(int distanceLeft, int distanceFront, int distanceRight) #--# DistanceSensor/out sensorData(int distanceLeft, int distanceFront, int distanceRight)" referenceDiagram="Design" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5354" id="2042" >
+<COMPONENT type="5354" id="2054" >
 <cdparam x="79" y="245" />
 <sizeparam width="250" height="100" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="TTY0" value="name" />
-<TGConnectingPoint num="0" id="2018" />
-<TGConnectingPoint num="1" id="2019" />
-<TGConnectingPoint num="2" id="2020" />
-<TGConnectingPoint num="3" id="2021" />
-<TGConnectingPoint num="4" id="2022" />
-<TGConnectingPoint num="5" id="2023" />
-<TGConnectingPoint num="6" id="2024" />
-<TGConnectingPoint num="7" id="2025" />
-<TGConnectingPoint num="8" id="2026" />
-<TGConnectingPoint num="9" id="2027" />
-<TGConnectingPoint num="10" id="2028" />
-<TGConnectingPoint num="11" id="2029" />
-<TGConnectingPoint num="12" id="2030" />
-<TGConnectingPoint num="13" id="2031" />
-<TGConnectingPoint num="14" id="2032" />
-<TGConnectingPoint num="15" id="2033" />
-<TGConnectingPoint num="16" id="2034" />
-<TGConnectingPoint num="17" id="2035" />
-<TGConnectingPoint num="18" id="2036" />
-<TGConnectingPoint num="19" id="2037" />
-<TGConnectingPoint num="20" id="2038" />
-<TGConnectingPoint num="21" id="2039" />
-<TGConnectingPoint num="22" id="2040" />
-<TGConnectingPoint num="23" id="2041" />
+<TGConnectingPoint num="0" id="2030" />
+<TGConnectingPoint num="1" id="2031" />
+<TGConnectingPoint num="2" id="2032" />
+<TGConnectingPoint num="3" id="2033" />
+<TGConnectingPoint num="4" id="2034" />
+<TGConnectingPoint num="5" id="2035" />
+<TGConnectingPoint num="6" id="2036" />
+<TGConnectingPoint num="7" id="2037" />
+<TGConnectingPoint num="8" id="2038" />
+<TGConnectingPoint num="9" id="2039" />
+<TGConnectingPoint num="10" id="2040" />
+<TGConnectingPoint num="11" id="2041" />
+<TGConnectingPoint num="12" id="2042" />
+<TGConnectingPoint num="13" id="2043" />
+<TGConnectingPoint num="14" id="2044" />
+<TGConnectingPoint num="15" id="2045" />
+<TGConnectingPoint num="16" id="2046" />
+<TGConnectingPoint num="17" id="2047" />
+<TGConnectingPoint num="18" id="2048" />
+<TGConnectingPoint num="19" id="2049" />
+<TGConnectingPoint num="20" id="2050" />
+<TGConnectingPoint num="21" id="2051" />
+<TGConnectingPoint num="22" id="2052" />
+<TGConnectingPoint num="23" id="2053" />
 <extraparam>
 <info stereotype="TTY" nodeName="TTY0" />
 <attributes index="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5351" id="2103" >
+<COMPONENT type="5351" id="2115" >
 <cdparam x="79" y="10" />
 <sizeparam width="250" height="213" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="2079" />
-<TGConnectingPoint num="1" id="2080" />
-<TGConnectingPoint num="2" id="2081" />
-<TGConnectingPoint num="3" id="2082" />
-<TGConnectingPoint num="4" id="2083" />
-<TGConnectingPoint num="5" id="2084" />
-<TGConnectingPoint num="6" id="2085" />
-<TGConnectingPoint num="7" id="2086" />
-<TGConnectingPoint num="8" id="2087" />
-<TGConnectingPoint num="9" id="2088" />
-<TGConnectingPoint num="10" id="2089" />
-<TGConnectingPoint num="11" id="2090" />
-<TGConnectingPoint num="12" id="2091" />
-<TGConnectingPoint num="13" id="2092" />
-<TGConnectingPoint num="14" id="2093" />
-<TGConnectingPoint num="15" id="2094" />
-<TGConnectingPoint num="16" id="2095" />
-<TGConnectingPoint num="17" id="2096" />
-<TGConnectingPoint num="18" id="2097" />
-<TGConnectingPoint num="19" id="2098" />
-<TGConnectingPoint num="20" id="2099" />
-<TGConnectingPoint num="21" id="2100" />
-<TGConnectingPoint num="22" id="2101" />
-<TGConnectingPoint num="23" id="2102" />
+<TGConnectingPoint num="0" id="2091" />
+<TGConnectingPoint num="1" id="2092" />
+<TGConnectingPoint num="2" id="2093" />
+<TGConnectingPoint num="3" id="2094" />
+<TGConnectingPoint num="4" id="2095" />
+<TGConnectingPoint num="5" id="2096" />
+<TGConnectingPoint num="6" id="2097" />
+<TGConnectingPoint num="7" id="2098" />
+<TGConnectingPoint num="8" id="2099" />
+<TGConnectingPoint num="9" id="2100" />
+<TGConnectingPoint num="10" id="2101" />
+<TGConnectingPoint num="11" id="2102" />
+<TGConnectingPoint num="12" id="2103" />
+<TGConnectingPoint num="13" id="2104" />
+<TGConnectingPoint num="14" id="2105" />
+<TGConnectingPoint num="15" id="2106" />
+<TGConnectingPoint num="16" id="2107" />
+<TGConnectingPoint num="17" id="2108" />
+<TGConnectingPoint num="18" id="2109" />
+<TGConnectingPoint num="19" id="2110" />
+<TGConnectingPoint num="20" id="2111" />
+<TGConnectingPoint num="21" id="2112" />
+<TGConnectingPoint num="22" id="2113" />
+<TGConnectingPoint num="23" id="2114" />
 <extraparam>
 <info stereotype="CPU" nodeName="CPU0" />
 <attributes nbOfIrq="6"  iCacheWays="8"  iCacheSets="4"  iCacheWords="4"  dCacheWays="8"  dCacheSets="4"  dCacheWords="4" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5352" id="2051" >
-<father id="2103" num="0" />
+<SUBCOMPONENT type="5352" id="2063" >
+<father id="2115" num="0" />
 <cdparam x="102" y="176" />
-<sizeparam width="156" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="160" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="94" minY="0" maxY="173" />
+<cdrectangleparam minX="0" maxX="90" minY="0" maxY="173" />
 <infoparam name="TGComponent" value="Design::MainControl" />
-<TGConnectingPoint num="0" id="2043" />
-<TGConnectingPoint num="1" id="2044" />
-<TGConnectingPoint num="2" id="2045" />
-<TGConnectingPoint num="3" id="2046" />
-<TGConnectingPoint num="4" id="2047" />
-<TGConnectingPoint num="5" id="2048" />
-<TGConnectingPoint num="6" id="2049" />
-<TGConnectingPoint num="7" id="2050" />
+<TGConnectingPoint num="0" id="2055" />
+<TGConnectingPoint num="1" id="2056" />
+<TGConnectingPoint num="2" id="2057" />
+<TGConnectingPoint num="3" id="2058" />
+<TGConnectingPoint num="4" id="2059" />
+<TGConnectingPoint num="5" id="2060" />
+<TGConnectingPoint num="6" id="2061" />
+<TGConnectingPoint num="7" id="2062" />
 <extraparam>
 <info value="Design::MainControl" taskName="MainControl" referenceTaskName="Design" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5352" id="2060" >
-<father id="2103" num="1" />
+<SUBCOMPONENT type="5352" id="2072" >
+<father id="2115" num="1" />
 <cdparam x="101" y="133" />
-<sizeparam width="180" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="185" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="70" minY="0" maxY="173" />
+<cdrectangleparam minX="0" maxX="65" minY="0" maxY="173" />
 <infoparam name="TGComponent" value="Design::DistanceSensor" />
-<TGConnectingPoint num="0" id="2052" />
-<TGConnectingPoint num="1" id="2053" />
-<TGConnectingPoint num="2" id="2054" />
-<TGConnectingPoint num="3" id="2055" />
-<TGConnectingPoint num="4" id="2056" />
-<TGConnectingPoint num="5" id="2057" />
-<TGConnectingPoint num="6" id="2058" />
-<TGConnectingPoint num="7" id="2059" />
+<TGConnectingPoint num="0" id="2064" />
+<TGConnectingPoint num="1" id="2065" />
+<TGConnectingPoint num="2" id="2066" />
+<TGConnectingPoint num="3" id="2067" />
+<TGConnectingPoint num="4" id="2068" />
+<TGConnectingPoint num="5" id="2069" />
+<TGConnectingPoint num="6" id="2070" />
+<TGConnectingPoint num="7" id="2071" />
 <extraparam>
 <info value="Design::DistanceSensor" taskName="DistanceSensor" referenceTaskName="Design" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5352" id="2069" >
-<father id="2103" num="2" />
+<SUBCOMPONENT type="5352" id="2081" >
+<father id="2115" num="2" />
 <cdparam x="101" y="89" />
-<sizeparam width="206" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="211" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="44" minY="0" maxY="173" />
+<cdrectangleparam minX="0" maxX="39" minY="0" maxY="173" />
 <infoparam name="TGComponent" value="Design::TemperatureSensor" />
-<TGConnectingPoint num="0" id="2061" />
-<TGConnectingPoint num="1" id="2062" />
-<TGConnectingPoint num="2" id="2063" />
-<TGConnectingPoint num="3" id="2064" />
-<TGConnectingPoint num="4" id="2065" />
-<TGConnectingPoint num="5" id="2066" />
-<TGConnectingPoint num="6" id="2067" />
-<TGConnectingPoint num="7" id="2068" />
+<TGConnectingPoint num="0" id="2073" />
+<TGConnectingPoint num="1" id="2074" />
+<TGConnectingPoint num="2" id="2075" />
+<TGConnectingPoint num="3" id="2076" />
+<TGConnectingPoint num="4" id="2077" />
+<TGConnectingPoint num="5" id="2078" />
+<TGConnectingPoint num="6" id="2079" />
+<TGConnectingPoint num="7" id="2080" />
 <extraparam>
 <info value="Design::TemperatureSensor" taskName="TemperatureSensor" referenceTaskName="Design" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5352" id="2078" >
-<father id="2103" num="3" />
+<SUBCOMPONENT type="5352" id="2090" >
+<father id="2115" num="3" />
 <cdparam x="100" y="44" />
-<sizeparam width="164" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="167" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="86" minY="0" maxY="173" />
+<cdrectangleparam minX="0" maxX="83" minY="0" maxY="173" />
 <infoparam name="TGComponent" value="Design::MotorControl" />
-<TGConnectingPoint num="0" id="2070" />
-<TGConnectingPoint num="1" id="2071" />
-<TGConnectingPoint num="2" id="2072" />
-<TGConnectingPoint num="3" id="2073" />
-<TGConnectingPoint num="4" id="2074" />
-<TGConnectingPoint num="5" id="2075" />
-<TGConnectingPoint num="6" id="2076" />
-<TGConnectingPoint num="7" id="2077" />
+<TGConnectingPoint num="0" id="2082" />
+<TGConnectingPoint num="1" id="2083" />
+<TGConnectingPoint num="2" id="2084" />
+<TGConnectingPoint num="3" id="2085" />
+<TGConnectingPoint num="4" id="2086" />
+<TGConnectingPoint num="5" id="2087" />
+<TGConnectingPoint num="6" id="2088" />
+<TGConnectingPoint num="7" id="2089" />
 <extraparam>
 <info value="Design::MotorControl" taskName="MotorControl" referenceTaskName="Design" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5350" id="2104" >
+<CONNECTOR type="5350" id="2116" >
 <cdparam x="793" y="217" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="797" y="212" id="1996" />
-<P2  x="710" y="212" id="1945" />
+<P1  x="797" y="212" id="2008" />
+<P2  x="710" y="212" id="1957" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <spy value="true" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5350" id="2105" >
+<CONNECTOR type="5350" id="2117" >
 <cdparam x="329" y="345" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="329" y="295" id="2022" />
-<P2  x="460" y="237" id="1946" />
+<P1  x="329" y="295" id="2034" />
+<P2  x="460" y="237" id="1958" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <spy value="false" />
 </extraparam>
 </CONNECTOR>
-<CONNECTOR type="5350" id="2106" >
+<CONNECTOR type="5350" id="2118" >
 <cdparam x="329" y="123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="{info}" />
-<P1  x="329" y="116" id="2083" />
-<P2  x="460" y="187" id="1941" />
+<P1  x="329" y="116" id="2095" />
+<P2  x="460" y="187" id="1953" />
 <AutomaticDrawing  data="true" />
 <extraparam>
 <spy value="false" />
diff --git a/modeling/SysMLSec/ACVI2016/acvi16_demo_full_test.xml b/modeling/SysMLSec/ACVI2016/acvi16_demo_full_test.xml
index 2c4c31502586df717deaf49945fcb82dccd73729..9a44face5457ae05f6c738b8529b7e6446ffd34f 100644
--- a/modeling/SysMLSec/ACVI2016/acvi16_demo_full_test.xml
+++ b/modeling/SysMLSec/ACVI2016/acvi16_demo_full_test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="0.99-beta4">
 
 <Modeling type="Requirement" nameTab="General Requirements" >
 <TRequirementDiagramPanel name="AvailabilityRequirements" minX="10" maxX="1905" minY="10" maxY="905" zoom="1.0000000000000002" >
@@ -2417,63 +2417,12 @@ satisfied with &quot;System&quot;.
 <TGConnectingPoint num="23" id="1327" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="false" />
+<Signal value="out chout(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="1278" >
-<father id="1328" num="0" />
-<cdparam x="257" y="214" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
-<infoparam name="Block0" value="Bob" />
-<TGConnectingPoint num="0" id="1254" />
-<TGConnectingPoint num="1" id="1255" />
-<TGConnectingPoint num="2" id="1256" />
-<TGConnectingPoint num="3" id="1257" />
-<TGConnectingPoint num="4" id="1258" />
-<TGConnectingPoint num="5" id="1259" />
-<TGConnectingPoint num="6" id="1260" />
-<TGConnectingPoint num="7" id="1261" />
-<TGConnectingPoint num="8" id="1262" />
-<TGConnectingPoint num="9" id="1263" />
-<TGConnectingPoint num="10" id="1264" />
-<TGConnectingPoint num="11" id="1265" />
-<TGConnectingPoint num="12" id="1266" />
-<TGConnectingPoint num="13" id="1267" />
-<TGConnectingPoint num="14" id="1268" />
-<TGConnectingPoint num="15" id="1269" />
-<TGConnectingPoint num="16" id="1270" />
-<TGConnectingPoint num="17" id="1271" />
-<TGConnectingPoint num="18" id="1272" />
-<TGConnectingPoint num="19" id="1273" />
-<TGConnectingPoint num="20" id="1274" />
-<TGConnectingPoint num="21" id="1275" />
-<TGConnectingPoint num="22" id="1276" />
-<TGConnectingPoint num="23" id="1277" />
-<extraparam>
-<CryptoBlock value="false" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
-<Method value="Message encrypt(Message msg, Key k)" />
-<Method value="Message decrypt(Message msg, Key k)" />
-<Method value="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Message MAC(Message msg, Key k)" />
-<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
-<Method value="Message concat2(Message msg1, Message msg2)" />
-<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
-<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
-<Method value="get2(Message msg, Message msg1, Message msg2)" />
-<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
-<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="1303" >
-<father id="1328" num="1" />
+<father id="1328" num="0" />
 <cdparam x="30" y="213" />
 <sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2504,7 +2453,7 @@ satisfied with &quot;System&quot;.
 <TGConnectingPoint num="22" id="1301" />
 <TGConnectingPoint num="23" id="1302" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="m" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
@@ -2521,6 +2470,77 @@ satisfied with &quot;System&quot;.
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="1278" >
+<father id="1328" num="1" />
+<cdparam x="257" y="214" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="Bob" />
+<TGConnectingPoint num="0" id="1254" />
+<TGConnectingPoint num="1" id="1255" />
+<TGConnectingPoint num="2" id="1256" />
+<TGConnectingPoint num="3" id="1257" />
+<TGConnectingPoint num="4" id="1258" />
+<TGConnectingPoint num="5" id="1259" />
+<TGConnectingPoint num="6" id="1260" />
+<TGConnectingPoint num="7" id="1261" />
+<TGConnectingPoint num="8" id="1262" />
+<TGConnectingPoint num="9" id="1263" />
+<TGConnectingPoint num="10" id="1264" />
+<TGConnectingPoint num="11" id="1265" />
+<TGConnectingPoint num="12" id="1266" />
+<TGConnectingPoint num="13" id="1267" />
+<TGConnectingPoint num="14" id="1268" />
+<TGConnectingPoint num="15" id="1269" />
+<TGConnectingPoint num="16" id="1270" />
+<TGConnectingPoint num="17" id="1271" />
+<TGConnectingPoint num="18" id="1272" />
+<TGConnectingPoint num="19" id="1273" />
+<TGConnectingPoint num="20" id="1274" />
+<TGConnectingPoint num="21" id="1275" />
+<TGConnectingPoint num="22" id="1276" />
+<TGConnectingPoint num="23" id="1277" />
+<extraparam>
+<CryptoBlock value="true" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="receivedData" value="" type="8" typeOther="" />
+<Method value="Message encrypt(Message msg, Key k)" />
+<Method value="Message decrypt(Message msg, Key k)" />
+<Method value="Message sencrypt(Message msg, Key k)" />
+<Method value="Message sdecrypt(Message msg, Key k)" />
+<Method value="Message MAC(Message msg, Key k)" />
+<Method value="bool verifyMAC(Message msg, Key k, Message macmsg)" />
+<Method value="Message concat2(Message msg1, Message msg2)" />
+<Method value="Message concat3(Message msg1, Message msg2, Message msg3)" />
+<Method value="Message concat4(Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="get2(Message msg, Message msg1, Message msg2)" />
+<Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
+<Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2540,82 +2560,84 @@ satisfied with &quot;System&quot;.
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1337" >
-<cdparam x="410" y="393" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="1336" />
-<P1  x="410" y="393" id="1389" />
-<P2  x="414" y="445" id="1435" />
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1527" >
+<cdparam x="416" y="379" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1526" />
+<P1  x="416" y="379" id="1562" />
+<P2  x="420" y="424" id="1598" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1335" >
-<father id="1337" num="0" />
-<cdparam x="410" y="433" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1525" >
+<father id="1527" num="0" />
+<cdparam x="431" y="403" />
+<sizeparam width="135" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1331" />
-<TGConnectingPoint num="1" id="1332" />
-<TGConnectingPoint num="2" id="1333" />
-<TGConnectingPoint num="3" id="1334" />
+<TGConnectingPoint num="0" id="1521" />
+<TGConnectingPoint num="1" id="1522" />
+<TGConnectingPoint num="2" id="1523" />
+<TGConnectingPoint num="3" id="1524" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1344" >
-<cdparam x="407" y="310" />
+<CONNECTOR type="5102" id="1534" >
+<cdparam x="407" y="273" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="1343" />
-<P1  x="407" y="310" id="1425" />
-<P2  x="410" y="343" id="1384" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1533" />
+<P1  x="407" y="273" id="1644" />
+<P2  x="416" y="339" id="1557" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1342" >
-<father id="1344" num="0" />
-<cdparam x="407" y="350" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1532" >
+<father id="1534" num="0" />
+<cdparam x="419" y="312" />
+<sizeparam width="127" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1338" />
-<TGConnectingPoint num="1" id="1339" />
-<TGConnectingPoint num="2" id="1340" />
-<TGConnectingPoint num="3" id="1341" />
+<TGConnectingPoint num="0" id="1528" />
+<TGConnectingPoint num="1" id="1529" />
+<TGConnectingPoint num="2" id="1530" />
+<TGConnectingPoint num="3" id="1531" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1351" >
-<cdparam x="407" y="251" />
+<CONNECTOR type="5102" id="1541" >
+<cdparam x="406" y="201" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="1350" />
-<P1  x="407" y="251" id="1443" />
-<P2  x="407" y="280" id="1424" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="1540" />
+<P1  x="406" y="201" id="1680" />
+<P2  x="407" y="233" id="1639" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1349" >
-<father id="1351" num="0" />
-<cdparam x="407" y="291" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1539" >
+<father id="1541" num="0" />
+<cdparam x="406" y="241" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1345" />
-<TGConnectingPoint num="1" id="1346" />
-<TGConnectingPoint num="2" id="1347" />
-<TGConnectingPoint num="3" id="1348" />
+<TGConnectingPoint num="0" id="1535" />
+<TGConnectingPoint num="1" id="1536" />
+<TGConnectingPoint num="2" id="1537" />
+<TGConnectingPoint num="3" id="1538" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2625,55 +2647,53 @@ satisfied with &quot;System&quot;.
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1358" >
-<cdparam x="407" y="132" />
+<CONNECTOR type="5102" id="1548" >
+<cdparam x="406" y="141" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1357" />
-<P1  x="407" y="132" id="1484" />
-<P2  x="407" y="211" id="1438" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="1547" />
+<P1  x="406" y="141" id="1696" />
+<P2  x="406" y="171" id="1679" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1356" >
-<father id="1358" num="0" />
-<cdparam x="415" y="162" />
-<sizeparam width="126" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1546" >
+<father id="1548" num="0" />
+<cdparam x="406" y="181" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1352" />
-<TGConnectingPoint num="1" id="1353" />
-<TGConnectingPoint num="2" id="1354" />
-<TGConnectingPoint num="3" id="1355" />
+<TGConnectingPoint num="0" id="1542" />
+<TGConnectingPoint num="1" id="1543" />
+<TGConnectingPoint num="2" id="1544" />
+<TGConnectingPoint num="3" id="1545" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m.data = secretData" />
-<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1365" >
+<CONNECTOR type="5102" id="1555" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1364" />
-<P1  x="407" y="70" id="1519" />
-<P2  x="407" y="92" id="1479" />
+<TGConnectingPoint num="0" id="1554" />
+<P1  x="407" y="70" id="1731" />
+<P2  x="406" y="101" id="1691" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1363" >
-<father id="1365" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1553" >
+<father id="1555" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1359" />
-<TGConnectingPoint num="1" id="1360" />
-<TGConnectingPoint num="2" id="1361" />
-<TGConnectingPoint num="3" id="1362" />
+<TGConnectingPoint num="0" id="1549" />
+<TGConnectingPoint num="1" id="1550" />
+<TGConnectingPoint num="2" id="1551" />
+<TGConnectingPoint num="3" id="1552" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2683,303 +2703,312 @@ satisfied with &quot;System&quot;.
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="301" id="1382" >
-<cdparam x="481" y="270" />
-<sizeparam width="211" height="27" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1596" >
+<cdparam x="327" y="339" />
+<sizeparam width="178" height="40" minWidth="40" minHeight="30" 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="Replace m with m1
-Experiment with private channels
-" />
-<TGConnectingPoint num="0" id="1366" />
-<TGConnectingPoint num="1" id="1367" />
-<TGConnectingPoint num="2" id="1368" />
-<TGConnectingPoint num="3" id="1369" />
-<TGConnectingPoint num="4" id="1370" />
-<TGConnectingPoint num="5" id="1371" />
-<TGConnectingPoint num="6" id="1372" />
-<TGConnectingPoint num="7" id="1373" />
-<TGConnectingPoint num="8" id="1374" />
-<TGConnectingPoint num="9" id="1375" />
-<TGConnectingPoint num="10" id="1376" />
-<TGConnectingPoint num="11" id="1377" />
-<TGConnectingPoint num="12" id="1378" />
-<TGConnectingPoint num="13" id="1379" />
-<TGConnectingPoint num="14" id="1380" />
-<TGConnectingPoint num="15" id="1381" />
+<infoparam name="state0" value="messageDecrypted" />
+<TGConnectingPoint num="0" id="1556" />
+<TGConnectingPoint num="1" id="1557" />
+<TGConnectingPoint num="2" id="1558" />
+<TGConnectingPoint num="3" id="1559" />
+<TGConnectingPoint num="4" id="1560" />
+<TGConnectingPoint num="5" id="1561" />
+<TGConnectingPoint num="6" id="1562" />
+<TGConnectingPoint num="7" id="1563" />
+<TGConnectingPoint num="8" id="1564" />
+<TGConnectingPoint num="9" id="1565" />
+<TGConnectingPoint num="10" id="1566" />
+<TGConnectingPoint num="11" id="1567" />
+<TGConnectingPoint num="12" id="1568" />
+<TGConnectingPoint num="13" id="1569" />
+<TGConnectingPoint num="14" id="1570" />
+<TGConnectingPoint num="15" id="1571" />
+<TGConnectingPoint num="16" id="1572" />
+<TGConnectingPoint num="17" id="1573" />
+<TGConnectingPoint num="18" id="1574" />
+<TGConnectingPoint num="19" id="1575" />
+<TGConnectingPoint num="20" id="1576" />
+<TGConnectingPoint num="21" id="1577" />
+<TGConnectingPoint num="22" id="1578" />
+<TGConnectingPoint num="23" id="1579" />
+<TGConnectingPoint num="24" id="1580" />
+<TGConnectingPoint num="25" id="1581" />
+<TGConnectingPoint num="26" id="1582" />
+<TGConnectingPoint num="27" id="1583" />
+<TGConnectingPoint num="28" id="1584" />
+<TGConnectingPoint num="29" id="1585" />
+<TGConnectingPoint num="30" id="1586" />
+<TGConnectingPoint num="31" id="1587" />
+<TGConnectingPoint num="32" id="1588" />
+<TGConnectingPoint num="33" id="1589" />
+<TGConnectingPoint num="34" id="1590" />
+<TGConnectingPoint num="35" id="1591" />
+<TGConnectingPoint num="36" id="1592" />
+<TGConnectingPoint num="37" id="1593" />
+<TGConnectingPoint num="38" id="1594" />
+<TGConnectingPoint num="39" id="1595" />
 <extraparam>
-<Line value="Replace m with m1" />
-<Line value="Experiment with private channels" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1423" >
-<cdparam x="360" y="343" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1637" >
+<cdparam x="350" y="424" />
+<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="MessageSent" />
-<TGConnectingPoint num="0" id="1383" />
-<TGConnectingPoint num="1" id="1384" />
-<TGConnectingPoint num="2" id="1385" />
-<TGConnectingPoint num="3" id="1386" />
-<TGConnectingPoint num="4" id="1387" />
-<TGConnectingPoint num="5" id="1388" />
-<TGConnectingPoint num="6" id="1389" />
-<TGConnectingPoint num="7" id="1390" />
-<TGConnectingPoint num="8" id="1391" />
-<TGConnectingPoint num="9" id="1392" />
-<TGConnectingPoint num="10" id="1393" />
-<TGConnectingPoint num="11" id="1394" />
-<TGConnectingPoint num="12" id="1395" />
-<TGConnectingPoint num="13" id="1396" />
-<TGConnectingPoint num="14" id="1397" />
-<TGConnectingPoint num="15" id="1398" />
-<TGConnectingPoint num="16" id="1399" />
-<TGConnectingPoint num="17" id="1400" />
-<TGConnectingPoint num="18" id="1401" />
-<TGConnectingPoint num="19" id="1402" />
-<TGConnectingPoint num="20" id="1403" />
-<TGConnectingPoint num="21" id="1404" />
-<TGConnectingPoint num="22" id="1405" />
-<TGConnectingPoint num="23" id="1406" />
-<TGConnectingPoint num="24" id="1407" />
-<TGConnectingPoint num="25" id="1408" />
-<TGConnectingPoint num="26" id="1409" />
-<TGConnectingPoint num="27" id="1410" />
-<TGConnectingPoint num="28" id="1411" />
-<TGConnectingPoint num="29" id="1412" />
-<TGConnectingPoint num="30" id="1413" />
-<TGConnectingPoint num="31" id="1414" />
-<TGConnectingPoint num="32" id="1415" />
-<TGConnectingPoint num="33" id="1416" />
-<TGConnectingPoint num="34" id="1417" />
-<TGConnectingPoint num="35" id="1418" />
-<TGConnectingPoint num="36" id="1419" />
-<TGConnectingPoint num="37" id="1420" />
-<TGConnectingPoint num="38" id="1421" />
-<TGConnectingPoint num="39" id="1422" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="1597" />
+<TGConnectingPoint num="1" id="1598" />
+<TGConnectingPoint num="2" id="1599" />
+<TGConnectingPoint num="3" id="1600" />
+<TGConnectingPoint num="4" id="1601" />
+<TGConnectingPoint num="5" id="1602" />
+<TGConnectingPoint num="6" id="1603" />
+<TGConnectingPoint num="7" id="1604" />
+<TGConnectingPoint num="8" id="1605" />
+<TGConnectingPoint num="9" id="1606" />
+<TGConnectingPoint num="10" id="1607" />
+<TGConnectingPoint num="11" id="1608" />
+<TGConnectingPoint num="12" id="1609" />
+<TGConnectingPoint num="13" id="1610" />
+<TGConnectingPoint num="14" id="1611" />
+<TGConnectingPoint num="15" id="1612" />
+<TGConnectingPoint num="16" id="1613" />
+<TGConnectingPoint num="17" id="1614" />
+<TGConnectingPoint num="18" id="1615" />
+<TGConnectingPoint num="19" id="1616" />
+<TGConnectingPoint num="20" id="1617" />
+<TGConnectingPoint num="21" id="1618" />
+<TGConnectingPoint num="22" id="1619" />
+<TGConnectingPoint num="23" id="1620" />
+<TGConnectingPoint num="24" id="1621" />
+<TGConnectingPoint num="25" id="1622" />
+<TGConnectingPoint num="26" id="1623" />
+<TGConnectingPoint num="27" id="1624" />
+<TGConnectingPoint num="28" id="1625" />
+<TGConnectingPoint num="29" id="1626" />
+<TGConnectingPoint num="30" id="1627" />
+<TGConnectingPoint num="31" id="1628" />
+<TGConnectingPoint num="32" id="1629" />
+<TGConnectingPoint num="33" id="1630" />
+<TGConnectingPoint num="34" id="1631" />
+<TGConnectingPoint num="35" id="1632" />
+<TGConnectingPoint num="36" id="1633" />
+<TGConnectingPoint num="37" id="1634" />
+<TGConnectingPoint num="38" id="1635" />
+<TGConnectingPoint num="39" id="1636" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1434" >
-<cdparam x="373" y="285" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1678" >
+<cdparam x="336" y="233" />
+<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="1424" />
-<TGConnectingPoint num="1" id="1425" />
-<TGConnectingPoint num="2" id="1426" />
-<TGConnectingPoint num="3" id="1427" />
-<TGConnectingPoint num="4" id="1428" />
-<TGConnectingPoint num="5" id="1429" />
-<TGConnectingPoint num="6" id="1430" />
-<TGConnectingPoint num="7" id="1431" />
-<TGConnectingPoint num="8" id="1432" />
-<TGConnectingPoint num="9" id="1433" />
+<infoparam name="state0" value="messageDecrypt" />
+<TGConnectingPoint num="0" id="1638" />
+<TGConnectingPoint num="1" id="1639" />
+<TGConnectingPoint num="2" id="1640" />
+<TGConnectingPoint num="3" id="1641" />
+<TGConnectingPoint num="4" id="1642" />
+<TGConnectingPoint num="5" id="1643" />
+<TGConnectingPoint num="6" id="1644" />
+<TGConnectingPoint num="7" id="1645" />
+<TGConnectingPoint num="8" id="1646" />
+<TGConnectingPoint num="9" id="1647" />
+<TGConnectingPoint num="10" id="1648" />
+<TGConnectingPoint num="11" id="1649" />
+<TGConnectingPoint num="12" id="1650" />
+<TGConnectingPoint num="13" id="1651" />
+<TGConnectingPoint num="14" id="1652" />
+<TGConnectingPoint num="15" id="1653" />
+<TGConnectingPoint num="16" id="1654" />
+<TGConnectingPoint num="17" id="1655" />
+<TGConnectingPoint num="18" id="1656" />
+<TGConnectingPoint num="19" id="1657" />
+<TGConnectingPoint num="20" id="1658" />
+<TGConnectingPoint num="21" id="1659" />
+<TGConnectingPoint num="22" id="1660" />
+<TGConnectingPoint num="23" id="1661" />
+<TGConnectingPoint num="24" id="1662" />
+<TGConnectingPoint num="25" id="1663" />
+<TGConnectingPoint num="26" id="1664" />
+<TGConnectingPoint num="27" id="1665" />
+<TGConnectingPoint num="28" id="1666" />
+<TGConnectingPoint num="29" id="1667" />
+<TGConnectingPoint num="30" id="1668" />
+<TGConnectingPoint num="31" id="1669" />
+<TGConnectingPoint num="32" id="1670" />
+<TGConnectingPoint num="33" id="1671" />
+<TGConnectingPoint num="34" id="1672" />
+<TGConnectingPoint num="35" id="1673" />
+<TGConnectingPoint num="36" id="1674" />
+<TGConnectingPoint num="37" id="1675" />
+<TGConnectingPoint num="38" id="1676" />
+<TGConnectingPoint num="39" id="1677" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5101" id="1436" >
-<cdparam x="404" y="450" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1689" >
+<cdparam x="372" y="176" />
+<sizeparam width="68" 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="1435" />
+<infoparam name="Send signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="1679" />
+<TGConnectingPoint num="1" id="1680" />
+<TGConnectingPoint num="2" id="1681" />
+<TGConnectingPoint num="3" id="1682" />
+<TGConnectingPoint num="4" id="1683" />
+<TGConnectingPoint num="5" id="1684" />
+<TGConnectingPoint num="6" id="1685" />
+<TGConnectingPoint num="7" id="1686" />
+<TGConnectingPoint num="8" id="1687" />
+<TGConnectingPoint num="9" id="1688" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1477" >
-<cdparam x="336" y="211" />
-<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1730" >
+<cdparam x="340" y="101" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="sendingMessage" />
-<TGConnectingPoint num="0" id="1437" />
-<TGConnectingPoint num="1" id="1438" />
-<TGConnectingPoint num="2" id="1439" />
-<TGConnectingPoint num="3" id="1440" />
-<TGConnectingPoint num="4" id="1441" />
-<TGConnectingPoint num="5" id="1442" />
-<TGConnectingPoint num="6" id="1443" />
-<TGConnectingPoint num="7" id="1444" />
-<TGConnectingPoint num="8" id="1445" />
-<TGConnectingPoint num="9" id="1446" />
-<TGConnectingPoint num="10" id="1447" />
-<TGConnectingPoint num="11" id="1448" />
-<TGConnectingPoint num="12" id="1449" />
-<TGConnectingPoint num="13" id="1450" />
-<TGConnectingPoint num="14" id="1451" />
-<TGConnectingPoint num="15" id="1452" />
-<TGConnectingPoint num="16" id="1453" />
-<TGConnectingPoint num="17" id="1454" />
-<TGConnectingPoint num="18" id="1455" />
-<TGConnectingPoint num="19" id="1456" />
-<TGConnectingPoint num="20" id="1457" />
-<TGConnectingPoint num="21" id="1458" />
-<TGConnectingPoint num="22" id="1459" />
-<TGConnectingPoint num="23" id="1460" />
-<TGConnectingPoint num="24" id="1461" />
-<TGConnectingPoint num="25" id="1462" />
-<TGConnectingPoint num="26" id="1463" />
-<TGConnectingPoint num="27" id="1464" />
-<TGConnectingPoint num="28" id="1465" />
-<TGConnectingPoint num="29" id="1466" />
-<TGConnectingPoint num="30" id="1467" />
-<TGConnectingPoint num="31" id="1468" />
-<TGConnectingPoint num="32" id="1469" />
-<TGConnectingPoint num="33" id="1470" />
-<TGConnectingPoint num="34" id="1471" />
-<TGConnectingPoint num="35" id="1472" />
-<TGConnectingPoint num="36" id="1473" />
-<TGConnectingPoint num="37" id="1474" />
-<TGConnectingPoint num="38" id="1475" />
-<TGConnectingPoint num="39" id="1476" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1518" >
-<cdparam x="340" y="92" />
-<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="makingMessage" />
-<TGConnectingPoint num="0" id="1478" />
-<TGConnectingPoint num="1" id="1479" />
-<TGConnectingPoint num="2" id="1480" />
-<TGConnectingPoint num="3" id="1481" />
-<TGConnectingPoint num="4" id="1482" />
-<TGConnectingPoint num="5" id="1483" />
-<TGConnectingPoint num="6" id="1484" />
-<TGConnectingPoint num="7" id="1485" />
-<TGConnectingPoint num="8" id="1486" />
-<TGConnectingPoint num="9" id="1487" />
-<TGConnectingPoint num="10" id="1488" />
-<TGConnectingPoint num="11" id="1489" />
-<TGConnectingPoint num="12" id="1490" />
-<TGConnectingPoint num="13" id="1491" />
-<TGConnectingPoint num="14" id="1492" />
-<TGConnectingPoint num="15" id="1493" />
-<TGConnectingPoint num="16" id="1494" />
-<TGConnectingPoint num="17" id="1495" />
-<TGConnectingPoint num="18" id="1496" />
-<TGConnectingPoint num="19" id="1497" />
-<TGConnectingPoint num="20" id="1498" />
-<TGConnectingPoint num="21" id="1499" />
-<TGConnectingPoint num="22" id="1500" />
-<TGConnectingPoint num="23" id="1501" />
-<TGConnectingPoint num="24" id="1502" />
-<TGConnectingPoint num="25" id="1503" />
-<TGConnectingPoint num="26" id="1504" />
-<TGConnectingPoint num="27" id="1505" />
-<TGConnectingPoint num="28" id="1506" />
-<TGConnectingPoint num="29" id="1507" />
-<TGConnectingPoint num="30" id="1508" />
-<TGConnectingPoint num="31" id="1509" />
-<TGConnectingPoint num="32" id="1510" />
-<TGConnectingPoint num="33" id="1511" />
-<TGConnectingPoint num="34" id="1512" />
-<TGConnectingPoint num="35" id="1513" />
-<TGConnectingPoint num="36" id="1514" />
-<TGConnectingPoint num="37" id="1515" />
-<TGConnectingPoint num="38" id="1516" />
-<TGConnectingPoint num="39" id="1517" />
+<infoparam name="state0" value="waitingForMessage" />
+<TGConnectingPoint num="0" id="1690" />
+<TGConnectingPoint num="1" id="1691" />
+<TGConnectingPoint num="2" id="1692" />
+<TGConnectingPoint num="3" id="1693" />
+<TGConnectingPoint num="4" id="1694" />
+<TGConnectingPoint num="5" id="1695" />
+<TGConnectingPoint num="6" id="1696" />
+<TGConnectingPoint num="7" id="1697" />
+<TGConnectingPoint num="8" id="1698" />
+<TGConnectingPoint num="9" id="1699" />
+<TGConnectingPoint num="10" id="1700" />
+<TGConnectingPoint num="11" id="1701" />
+<TGConnectingPoint num="12" id="1702" />
+<TGConnectingPoint num="13" id="1703" />
+<TGConnectingPoint num="14" id="1704" />
+<TGConnectingPoint num="15" id="1705" />
+<TGConnectingPoint num="16" id="1706" />
+<TGConnectingPoint num="17" id="1707" />
+<TGConnectingPoint num="18" id="1708" />
+<TGConnectingPoint num="19" id="1709" />
+<TGConnectingPoint num="20" id="1710" />
+<TGConnectingPoint num="21" id="1711" />
+<TGConnectingPoint num="22" id="1712" />
+<TGConnectingPoint num="23" id="1713" />
+<TGConnectingPoint num="24" id="1714" />
+<TGConnectingPoint num="25" id="1715" />
+<TGConnectingPoint num="26" id="1716" />
+<TGConnectingPoint num="27" id="1717" />
+<TGConnectingPoint num="28" id="1718" />
+<TGConnectingPoint num="29" id="1719" />
+<TGConnectingPoint num="30" id="1720" />
+<TGConnectingPoint num="31" id="1721" />
+<TGConnectingPoint num="32" id="1722" />
+<TGConnectingPoint num="33" id="1723" />
+<TGConnectingPoint num="34" id="1724" />
+<TGConnectingPoint num="35" id="1725" />
+<TGConnectingPoint num="36" id="1726" />
+<TGConnectingPoint num="37" id="1727" />
+<TGConnectingPoint num="38" id="1728" />
+<TGConnectingPoint num="39" id="1729" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1520" >
+<COMPONENT type="5100" id="1732" >
 <cdparam x="400" y="50" />
 <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="1519" />
+<TGConnectingPoint num="0" id="1731" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="1400" minY="10" maxY="900" >
-<CONNECTOR type="5102" id="1527" >
-<cdparam x="416" y="379" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1526" />
-<P1  x="416" y="379" id="1562" />
-<P2  x="420" y="424" id="1598" />
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="1400" minY="10" maxY="900" >
+<CONNECTOR type="5102" id="1337" >
+<cdparam x="410" y="393" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="1336" />
+<P1  x="410" y="393" id="1389" />
+<P2  x="414" y="445" id="1435" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1525" >
-<father id="1527" num="0" />
-<cdparam x="431" y="403" />
-<sizeparam width="135" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1335" >
+<father id="1337" num="0" />
+<cdparam x="410" y="433" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1521" />
-<TGConnectingPoint num="1" id="1522" />
-<TGConnectingPoint num="2" id="1523" />
-<TGConnectingPoint num="3" id="1524" />
+<TGConnectingPoint num="0" id="1331" />
+<TGConnectingPoint num="1" id="1332" />
+<TGConnectingPoint num="2" id="1333" />
+<TGConnectingPoint num="3" id="1334" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="receivedData = m.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1534" >
-<cdparam x="407" y="273" />
+<CONNECTOR type="5102" id="1344" >
+<cdparam x="407" y="310" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="1533" />
-<P1  x="407" y="273" id="1644" />
-<P2  x="416" y="339" id="1557" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="1343" />
+<P1  x="407" y="310" id="1425" />
+<P2  x="410" y="343" id="1384" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1532" >
-<father id="1534" num="0" />
-<cdparam x="419" y="312" />
-<sizeparam width="127" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1342" >
+<father id="1344" num="0" />
+<cdparam x="407" y="350" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1528" />
-<TGConnectingPoint num="1" id="1529" />
-<TGConnectingPoint num="2" id="1530" />
-<TGConnectingPoint num="3" id="1531" />
+<TGConnectingPoint num="0" id="1338" />
+<TGConnectingPoint num="1" id="1339" />
+<TGConnectingPoint num="2" id="1340" />
+<TGConnectingPoint num="3" id="1341" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="m = sdecrypt(m2, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1541" >
-<cdparam x="406" y="201" />
+<CONNECTOR type="5102" id="1351" >
+<cdparam x="407" y="251" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="1540" />
-<P1  x="406" y="201" id="1680" />
-<P2  x="407" y="233" id="1639" />
+<infoparam name="connector from state0 to stop state" value="null" />
+<TGConnectingPoint num="0" id="1350" />
+<P1  x="407" y="251" id="1443" />
+<P2  x="407" y="280" id="1424" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1539" >
-<father id="1541" num="0" />
-<cdparam x="406" y="241" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1349" >
+<father id="1351" num="0" />
+<cdparam x="407" y="291" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1535" />
-<TGConnectingPoint num="1" id="1536" />
-<TGConnectingPoint num="2" id="1537" />
-<TGConnectingPoint num="3" id="1538" />
+<TGConnectingPoint num="0" id="1345" />
+<TGConnectingPoint num="1" id="1346" />
+<TGConnectingPoint num="2" id="1347" />
+<TGConnectingPoint num="3" id="1348" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -2989,53 +3018,55 @@ Experiment with private channels
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1548" >
-<cdparam x="406" y="141" />
+<CONNECTOR type="5102" id="1358" >
+<cdparam x="407" y="132" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="1547" />
-<P1  x="406" y="141" id="1696" />
-<P2  x="406" y="171" id="1679" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="1357" />
+<P1  x="407" y="132" id="1484" />
+<P2  x="407" y="211" id="1438" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1546" >
-<father id="1548" num="0" />
-<cdparam x="406" y="181" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1356" >
+<father id="1358" num="0" />
+<cdparam x="415" y="162" />
+<sizeparam width="126" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1542" />
-<TGConnectingPoint num="1" id="1543" />
-<TGConnectingPoint num="2" id="1544" />
-<TGConnectingPoint num="3" id="1545" />
+<TGConnectingPoint num="0" id="1352" />
+<TGConnectingPoint num="1" id="1353" />
+<TGConnectingPoint num="2" id="1354" />
+<TGConnectingPoint num="3" id="1355" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="m.data = secretData" />
+<actions value="m1 = sencrypt(m, sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1555" >
+<CONNECTOR type="5102" id="1365" >
 <cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="1554" />
-<P1  x="407" y="70" id="1731" />
-<P2  x="406" y="101" id="1691" />
+<TGConnectingPoint num="0" id="1364" />
+<P1  x="407" y="70" id="1519" />
+<P2  x="407" y="92" id="1479" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1553" >
-<father id="1555" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1363" >
+<father id="1365" num="0" />
 <cdparam x="407" y="110" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1549" />
-<TGConnectingPoint num="1" id="1550" />
-<TGConnectingPoint num="2" id="1551" />
-<TGConnectingPoint num="3" id="1552" />
+<TGConnectingPoint num="0" id="1359" />
+<TGConnectingPoint num="1" id="1360" />
+<TGConnectingPoint num="2" id="1361" />
+<TGConnectingPoint num="3" id="1362" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -3045,231 +3076,220 @@ Experiment with private channels
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="1596" >
-<cdparam x="327" y="339" />
-<sizeparam width="178" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="1382" >
+<cdparam x="481" y="270" />
+<sizeparam width="211" height="27" 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="state0" value="messageDecrypted" />
-<TGConnectingPoint num="0" id="1556" />
-<TGConnectingPoint num="1" id="1557" />
-<TGConnectingPoint num="2" id="1558" />
-<TGConnectingPoint num="3" id="1559" />
-<TGConnectingPoint num="4" id="1560" />
-<TGConnectingPoint num="5" id="1561" />
-<TGConnectingPoint num="6" id="1562" />
-<TGConnectingPoint num="7" id="1563" />
-<TGConnectingPoint num="8" id="1564" />
-<TGConnectingPoint num="9" id="1565" />
-<TGConnectingPoint num="10" id="1566" />
-<TGConnectingPoint num="11" id="1567" />
-<TGConnectingPoint num="12" id="1568" />
-<TGConnectingPoint num="13" id="1569" />
-<TGConnectingPoint num="14" id="1570" />
-<TGConnectingPoint num="15" id="1571" />
-<TGConnectingPoint num="16" id="1572" />
-<TGConnectingPoint num="17" id="1573" />
-<TGConnectingPoint num="18" id="1574" />
-<TGConnectingPoint num="19" id="1575" />
-<TGConnectingPoint num="20" id="1576" />
-<TGConnectingPoint num="21" id="1577" />
-<TGConnectingPoint num="22" id="1578" />
-<TGConnectingPoint num="23" id="1579" />
-<TGConnectingPoint num="24" id="1580" />
-<TGConnectingPoint num="25" id="1581" />
-<TGConnectingPoint num="26" id="1582" />
-<TGConnectingPoint num="27" id="1583" />
-<TGConnectingPoint num="28" id="1584" />
-<TGConnectingPoint num="29" id="1585" />
-<TGConnectingPoint num="30" id="1586" />
-<TGConnectingPoint num="31" id="1587" />
-<TGConnectingPoint num="32" id="1588" />
-<TGConnectingPoint num="33" id="1589" />
-<TGConnectingPoint num="34" id="1590" />
-<TGConnectingPoint num="35" id="1591" />
-<TGConnectingPoint num="36" id="1592" />
-<TGConnectingPoint num="37" id="1593" />
-<TGConnectingPoint num="38" id="1594" />
-<TGConnectingPoint num="39" id="1595" />
+<infoparam name="UML Note" value="Replace m with m1
+Experiment with private channels
+" />
+<TGConnectingPoint num="0" id="1366" />
+<TGConnectingPoint num="1" id="1367" />
+<TGConnectingPoint num="2" id="1368" />
+<TGConnectingPoint num="3" id="1369" />
+<TGConnectingPoint num="4" id="1370" />
+<TGConnectingPoint num="5" id="1371" />
+<TGConnectingPoint num="6" id="1372" />
+<TGConnectingPoint num="7" id="1373" />
+<TGConnectingPoint num="8" id="1374" />
+<TGConnectingPoint num="9" id="1375" />
+<TGConnectingPoint num="10" id="1376" />
+<TGConnectingPoint num="11" id="1377" />
+<TGConnectingPoint num="12" id="1378" />
+<TGConnectingPoint num="13" id="1379" />
+<TGConnectingPoint num="14" id="1380" />
+<TGConnectingPoint num="15" id="1381" />
 <extraparam>
+<Line value="Replace m with m1" />
+<Line value="Experiment with private channels" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1637" >
-<cdparam x="350" y="424" />
-<sizeparam width="140" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1423" >
+<cdparam x="360" y="343" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="1597" />
-<TGConnectingPoint num="1" id="1598" />
-<TGConnectingPoint num="2" id="1599" />
-<TGConnectingPoint num="3" id="1600" />
-<TGConnectingPoint num="4" id="1601" />
-<TGConnectingPoint num="5" id="1602" />
-<TGConnectingPoint num="6" id="1603" />
-<TGConnectingPoint num="7" id="1604" />
-<TGConnectingPoint num="8" id="1605" />
-<TGConnectingPoint num="9" id="1606" />
-<TGConnectingPoint num="10" id="1607" />
-<TGConnectingPoint num="11" id="1608" />
-<TGConnectingPoint num="12" id="1609" />
-<TGConnectingPoint num="13" id="1610" />
-<TGConnectingPoint num="14" id="1611" />
-<TGConnectingPoint num="15" id="1612" />
-<TGConnectingPoint num="16" id="1613" />
-<TGConnectingPoint num="17" id="1614" />
-<TGConnectingPoint num="18" id="1615" />
-<TGConnectingPoint num="19" id="1616" />
-<TGConnectingPoint num="20" id="1617" />
-<TGConnectingPoint num="21" id="1618" />
-<TGConnectingPoint num="22" id="1619" />
-<TGConnectingPoint num="23" id="1620" />
-<TGConnectingPoint num="24" id="1621" />
-<TGConnectingPoint num="25" id="1622" />
-<TGConnectingPoint num="26" id="1623" />
-<TGConnectingPoint num="27" id="1624" />
-<TGConnectingPoint num="28" id="1625" />
-<TGConnectingPoint num="29" id="1626" />
-<TGConnectingPoint num="30" id="1627" />
-<TGConnectingPoint num="31" id="1628" />
-<TGConnectingPoint num="32" id="1629" />
-<TGConnectingPoint num="33" id="1630" />
-<TGConnectingPoint num="34" id="1631" />
-<TGConnectingPoint num="35" id="1632" />
-<TGConnectingPoint num="36" id="1633" />
-<TGConnectingPoint num="37" id="1634" />
-<TGConnectingPoint num="38" id="1635" />
-<TGConnectingPoint num="39" id="1636" />
+<infoparam name="state0" value="MessageSent" />
+<TGConnectingPoint num="0" id="1383" />
+<TGConnectingPoint num="1" id="1384" />
+<TGConnectingPoint num="2" id="1385" />
+<TGConnectingPoint num="3" id="1386" />
+<TGConnectingPoint num="4" id="1387" />
+<TGConnectingPoint num="5" id="1388" />
+<TGConnectingPoint num="6" id="1389" />
+<TGConnectingPoint num="7" id="1390" />
+<TGConnectingPoint num="8" id="1391" />
+<TGConnectingPoint num="9" id="1392" />
+<TGConnectingPoint num="10" id="1393" />
+<TGConnectingPoint num="11" id="1394" />
+<TGConnectingPoint num="12" id="1395" />
+<TGConnectingPoint num="13" id="1396" />
+<TGConnectingPoint num="14" id="1397" />
+<TGConnectingPoint num="15" id="1398" />
+<TGConnectingPoint num="16" id="1399" />
+<TGConnectingPoint num="17" id="1400" />
+<TGConnectingPoint num="18" id="1401" />
+<TGConnectingPoint num="19" id="1402" />
+<TGConnectingPoint num="20" id="1403" />
+<TGConnectingPoint num="21" id="1404" />
+<TGConnectingPoint num="22" id="1405" />
+<TGConnectingPoint num="23" id="1406" />
+<TGConnectingPoint num="24" id="1407" />
+<TGConnectingPoint num="25" id="1408" />
+<TGConnectingPoint num="26" id="1409" />
+<TGConnectingPoint num="27" id="1410" />
+<TGConnectingPoint num="28" id="1411" />
+<TGConnectingPoint num="29" id="1412" />
+<TGConnectingPoint num="30" id="1413" />
+<TGConnectingPoint num="31" id="1414" />
+<TGConnectingPoint num="32" id="1415" />
+<TGConnectingPoint num="33" id="1416" />
+<TGConnectingPoint num="34" id="1417" />
+<TGConnectingPoint num="35" id="1418" />
+<TGConnectingPoint num="36" id="1419" />
+<TGConnectingPoint num="37" id="1420" />
+<TGConnectingPoint num="38" id="1421" />
+<TGConnectingPoint num="39" id="1422" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1678" >
-<cdparam x="336" y="233" />
-<sizeparam width="142" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1434" >
+<cdparam x="373" y="285" />
+<sizeparam width="68" 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="state0" value="messageDecrypt" />
-<TGConnectingPoint num="0" id="1638" />
-<TGConnectingPoint num="1" id="1639" />
-<TGConnectingPoint num="2" id="1640" />
-<TGConnectingPoint num="3" id="1641" />
-<TGConnectingPoint num="4" id="1642" />
-<TGConnectingPoint num="5" id="1643" />
-<TGConnectingPoint num="6" id="1644" />
-<TGConnectingPoint num="7" id="1645" />
-<TGConnectingPoint num="8" id="1646" />
-<TGConnectingPoint num="9" id="1647" />
-<TGConnectingPoint num="10" id="1648" />
-<TGConnectingPoint num="11" id="1649" />
-<TGConnectingPoint num="12" id="1650" />
-<TGConnectingPoint num="13" id="1651" />
-<TGConnectingPoint num="14" id="1652" />
-<TGConnectingPoint num="15" id="1653" />
-<TGConnectingPoint num="16" id="1654" />
-<TGConnectingPoint num="17" id="1655" />
-<TGConnectingPoint num="18" id="1656" />
-<TGConnectingPoint num="19" id="1657" />
-<TGConnectingPoint num="20" id="1658" />
-<TGConnectingPoint num="21" id="1659" />
-<TGConnectingPoint num="22" id="1660" />
-<TGConnectingPoint num="23" id="1661" />
-<TGConnectingPoint num="24" id="1662" />
-<TGConnectingPoint num="25" id="1663" />
-<TGConnectingPoint num="26" id="1664" />
-<TGConnectingPoint num="27" id="1665" />
-<TGConnectingPoint num="28" id="1666" />
-<TGConnectingPoint num="29" id="1667" />
-<TGConnectingPoint num="30" id="1668" />
-<TGConnectingPoint num="31" id="1669" />
-<TGConnectingPoint num="32" id="1670" />
-<TGConnectingPoint num="33" id="1671" />
-<TGConnectingPoint num="34" id="1672" />
-<TGConnectingPoint num="35" id="1673" />
-<TGConnectingPoint num="36" id="1674" />
-<TGConnectingPoint num="37" id="1675" />
-<TGConnectingPoint num="38" id="1676" />
-<TGConnectingPoint num="39" id="1677" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="1424" />
+<TGConnectingPoint num="1" id="1425" />
+<TGConnectingPoint num="2" id="1426" />
+<TGConnectingPoint num="3" id="1427" />
+<TGConnectingPoint num="4" id="1428" />
+<TGConnectingPoint num="5" id="1429" />
+<TGConnectingPoint num="6" id="1430" />
+<TGConnectingPoint num="7" id="1431" />
+<TGConnectingPoint num="8" id="1432" />
+<TGConnectingPoint num="9" id="1433" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1689" >
-<cdparam x="372" y="176" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1436" >
+<cdparam x="404" y="450" />
+<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="Send signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="1679" />
-<TGConnectingPoint num="1" id="1680" />
-<TGConnectingPoint num="2" id="1681" />
-<TGConnectingPoint num="3" id="1682" />
-<TGConnectingPoint num="4" id="1683" />
-<TGConnectingPoint num="5" id="1684" />
-<TGConnectingPoint num="6" id="1685" />
-<TGConnectingPoint num="7" id="1686" />
-<TGConnectingPoint num="8" id="1687" />
-<TGConnectingPoint num="9" id="1688" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1435" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1730" >
-<cdparam x="340" y="101" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1477" >
+<cdparam x="336" y="211" />
+<sizeparam width="143" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state0" value="waitingForMessage" />
-<TGConnectingPoint num="0" id="1690" />
-<TGConnectingPoint num="1" id="1691" />
-<TGConnectingPoint num="2" id="1692" />
-<TGConnectingPoint num="3" id="1693" />
-<TGConnectingPoint num="4" id="1694" />
-<TGConnectingPoint num="5" id="1695" />
-<TGConnectingPoint num="6" id="1696" />
-<TGConnectingPoint num="7" id="1697" />
-<TGConnectingPoint num="8" id="1698" />
-<TGConnectingPoint num="9" id="1699" />
-<TGConnectingPoint num="10" id="1700" />
-<TGConnectingPoint num="11" id="1701" />
-<TGConnectingPoint num="12" id="1702" />
-<TGConnectingPoint num="13" id="1703" />
-<TGConnectingPoint num="14" id="1704" />
-<TGConnectingPoint num="15" id="1705" />
-<TGConnectingPoint num="16" id="1706" />
-<TGConnectingPoint num="17" id="1707" />
-<TGConnectingPoint num="18" id="1708" />
-<TGConnectingPoint num="19" id="1709" />
-<TGConnectingPoint num="20" id="1710" />
-<TGConnectingPoint num="21" id="1711" />
-<TGConnectingPoint num="22" id="1712" />
-<TGConnectingPoint num="23" id="1713" />
-<TGConnectingPoint num="24" id="1714" />
-<TGConnectingPoint num="25" id="1715" />
-<TGConnectingPoint num="26" id="1716" />
-<TGConnectingPoint num="27" id="1717" />
-<TGConnectingPoint num="28" id="1718" />
-<TGConnectingPoint num="29" id="1719" />
-<TGConnectingPoint num="30" id="1720" />
-<TGConnectingPoint num="31" id="1721" />
-<TGConnectingPoint num="32" id="1722" />
-<TGConnectingPoint num="33" id="1723" />
-<TGConnectingPoint num="34" id="1724" />
-<TGConnectingPoint num="35" id="1725" />
-<TGConnectingPoint num="36" id="1726" />
-<TGConnectingPoint num="37" id="1727" />
-<TGConnectingPoint num="38" id="1728" />
-<TGConnectingPoint num="39" id="1729" />
+<infoparam name="state0" value="sendingMessage" />
+<TGConnectingPoint num="0" id="1437" />
+<TGConnectingPoint num="1" id="1438" />
+<TGConnectingPoint num="2" id="1439" />
+<TGConnectingPoint num="3" id="1440" />
+<TGConnectingPoint num="4" id="1441" />
+<TGConnectingPoint num="5" id="1442" />
+<TGConnectingPoint num="6" id="1443" />
+<TGConnectingPoint num="7" id="1444" />
+<TGConnectingPoint num="8" id="1445" />
+<TGConnectingPoint num="9" id="1446" />
+<TGConnectingPoint num="10" id="1447" />
+<TGConnectingPoint num="11" id="1448" />
+<TGConnectingPoint num="12" id="1449" />
+<TGConnectingPoint num="13" id="1450" />
+<TGConnectingPoint num="14" id="1451" />
+<TGConnectingPoint num="15" id="1452" />
+<TGConnectingPoint num="16" id="1453" />
+<TGConnectingPoint num="17" id="1454" />
+<TGConnectingPoint num="18" id="1455" />
+<TGConnectingPoint num="19" id="1456" />
+<TGConnectingPoint num="20" id="1457" />
+<TGConnectingPoint num="21" id="1458" />
+<TGConnectingPoint num="22" id="1459" />
+<TGConnectingPoint num="23" id="1460" />
+<TGConnectingPoint num="24" id="1461" />
+<TGConnectingPoint num="25" id="1462" />
+<TGConnectingPoint num="26" id="1463" />
+<TGConnectingPoint num="27" id="1464" />
+<TGConnectingPoint num="28" id="1465" />
+<TGConnectingPoint num="29" id="1466" />
+<TGConnectingPoint num="30" id="1467" />
+<TGConnectingPoint num="31" id="1468" />
+<TGConnectingPoint num="32" id="1469" />
+<TGConnectingPoint num="33" id="1470" />
+<TGConnectingPoint num="34" id="1471" />
+<TGConnectingPoint num="35" id="1472" />
+<TGConnectingPoint num="36" id="1473" />
+<TGConnectingPoint num="37" id="1474" />
+<TGConnectingPoint num="38" id="1475" />
+<TGConnectingPoint num="39" id="1476" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="1732" >
+<COMPONENT type="5106" id="1518" >
+<cdparam x="340" y="92" />
+<sizeparam width="134" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="state0" value="makingMessage" />
+<TGConnectingPoint num="0" id="1478" />
+<TGConnectingPoint num="1" id="1479" />
+<TGConnectingPoint num="2" id="1480" />
+<TGConnectingPoint num="3" id="1481" />
+<TGConnectingPoint num="4" id="1482" />
+<TGConnectingPoint num="5" id="1483" />
+<TGConnectingPoint num="6" id="1484" />
+<TGConnectingPoint num="7" id="1485" />
+<TGConnectingPoint num="8" id="1486" />
+<TGConnectingPoint num="9" id="1487" />
+<TGConnectingPoint num="10" id="1488" />
+<TGConnectingPoint num="11" id="1489" />
+<TGConnectingPoint num="12" id="1490" />
+<TGConnectingPoint num="13" id="1491" />
+<TGConnectingPoint num="14" id="1492" />
+<TGConnectingPoint num="15" id="1493" />
+<TGConnectingPoint num="16" id="1494" />
+<TGConnectingPoint num="17" id="1495" />
+<TGConnectingPoint num="18" id="1496" />
+<TGConnectingPoint num="19" id="1497" />
+<TGConnectingPoint num="20" id="1498" />
+<TGConnectingPoint num="21" id="1499" />
+<TGConnectingPoint num="22" id="1500" />
+<TGConnectingPoint num="23" id="1501" />
+<TGConnectingPoint num="24" id="1502" />
+<TGConnectingPoint num="25" id="1503" />
+<TGConnectingPoint num="26" id="1504" />
+<TGConnectingPoint num="27" id="1505" />
+<TGConnectingPoint num="28" id="1506" />
+<TGConnectingPoint num="29" id="1507" />
+<TGConnectingPoint num="30" id="1508" />
+<TGConnectingPoint num="31" id="1509" />
+<TGConnectingPoint num="32" id="1510" />
+<TGConnectingPoint num="33" id="1511" />
+<TGConnectingPoint num="34" id="1512" />
+<TGConnectingPoint num="35" id="1513" />
+<TGConnectingPoint num="36" id="1514" />
+<TGConnectingPoint num="37" id="1515" />
+<TGConnectingPoint num="38" id="1516" />
+<TGConnectingPoint num="39" id="1517" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1520" >
 <cdparam x="400" y="50" />
 <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="1731" />
+<TGConnectingPoint num="0" id="1519" />
 </COMPONENT>
 
 
@@ -3337,619 +3357,9 @@ Experiment with private channels
 
 </InteractionOverviewDiagramPanel>
 
-<SequenceDiagramPanel name="SesK distribution" minX="10" maxX="2400" minY="10" maxY="900" >
-<COMPONENT type="301" id="1766" >
-<cdparam x="387" y="502" />
-<sizeparam width="328" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM sends an aknowledgement message to ECU1.
-It includes information about partial or total session
-key distribution in the group (SesKDistCode).
-" />
-<TGConnectingPoint num="0" id="1750" />
-<TGConnectingPoint num="1" id="1751" />
-<TGConnectingPoint num="2" id="1752" />
-<TGConnectingPoint num="3" id="1753" />
-<TGConnectingPoint num="4" id="1754" />
-<TGConnectingPoint num="5" id="1755" />
-<TGConnectingPoint num="6" id="1756" />
-<TGConnectingPoint num="7" id="1757" />
-<TGConnectingPoint num="8" id="1758" />
-<TGConnectingPoint num="9" id="1759" />
-<TGConnectingPoint num="10" id="1760" />
-<TGConnectingPoint num="11" id="1761" />
-<TGConnectingPoint num="12" id="1762" />
-<TGConnectingPoint num="13" id="1763" />
-<TGConnectingPoint num="14" id="1764" />
-<TGConnectingPoint num="15" id="1765" />
-<extraparam>
-<Line value="ECUKM sends an aknowledgement message to ECU1." />
-<Line value="It includes information about partial or total session" />
-<Line value="key distribution in the group (SesKDistCode)." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="1783" >
-<cdparam x="881" y="228" />
-<sizeparam width="310" height="27" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM verifies message integrity, authenticity and
-freshness and then stores the new session key.
-" />
-<TGConnectingPoint num="0" id="1767" />
-<TGConnectingPoint num="1" id="1768" />
-<TGConnectingPoint num="2" id="1769" />
-<TGConnectingPoint num="3" id="1770" />
-<TGConnectingPoint num="4" id="1771" />
-<TGConnectingPoint num="5" id="1772" />
-<TGConnectingPoint num="6" id="1773" />
-<TGConnectingPoint num="7" id="1774" />
-<TGConnectingPoint num="8" id="1775" />
-<TGConnectingPoint num="9" id="1776" />
-<TGConnectingPoint num="10" id="1777" />
-<TGConnectingPoint num="11" id="1778" />
-<TGConnectingPoint num="12" id="1779" />
-<TGConnectingPoint num="13" id="1780" />
-<TGConnectingPoint num="14" id="1781" />
-<TGConnectingPoint num="15" id="1782" />
-<extraparam>
-<Line value="ECUKM verifies message integrity, authenticity and" />
-<Line value="freshness and then stores the new session key." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="1800" >
-<cdparam x="367" y="226" />
-<sizeparam width="297" height="27" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECU1 sends the new session key to distribute it 
-among the members of the group.
-" />
-<TGConnectingPoint num="0" id="1784" />
-<TGConnectingPoint num="1" id="1785" />
-<TGConnectingPoint num="2" id="1786" />
-<TGConnectingPoint num="3" id="1787" />
-<TGConnectingPoint num="4" id="1788" />
-<TGConnectingPoint num="5" id="1789" />
-<TGConnectingPoint num="6" id="1790" />
-<TGConnectingPoint num="7" id="1791" />
-<TGConnectingPoint num="8" id="1792" />
-<TGConnectingPoint num="9" id="1793" />
-<TGConnectingPoint num="10" id="1794" />
-<TGConnectingPoint num="11" id="1795" />
-<TGConnectingPoint num="12" id="1796" />
-<TGConnectingPoint num="13" id="1797" />
-<TGConnectingPoint num="14" id="1798" />
-<TGConnectingPoint num="15" id="1799" />
-<extraparam>
-<Line value="ECU1 sends the new session key to distribute it " />
-<Line value="among the members of the group." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="1850" >
-<cdparam x="1477" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECUN" />
-<TGConnectingPoint num="0" id="1801" />
-<TGConnectingPoint num="1" id="1802" />
-<TGConnectingPoint num="2" id="1803" />
-<TGConnectingPoint num="3" id="1804" />
-<TGConnectingPoint num="4" id="1805" />
-<TGConnectingPoint num="5" id="1806" />
-<TGConnectingPoint num="6" id="1807" />
-<TGConnectingPoint num="7" id="1808" />
-<TGConnectingPoint num="8" id="1809" />
-<TGConnectingPoint num="9" id="1810" />
-<TGConnectingPoint num="10" id="1811" />
-<TGConnectingPoint num="11" id="1812" />
-<TGConnectingPoint num="12" id="1813" />
-<TGConnectingPoint num="13" id="1814" />
-<TGConnectingPoint num="14" id="1815" />
-<TGConnectingPoint num="15" id="1816" />
-<TGConnectingPoint num="16" id="1817" />
-<TGConnectingPoint num="17" id="1818" />
-<TGConnectingPoint num="18" id="1819" />
-<TGConnectingPoint num="19" id="1820" />
-<TGConnectingPoint num="20" id="1821" />
-<TGConnectingPoint num="21" id="1822" />
-<TGConnectingPoint num="22" id="1823" />
-<TGConnectingPoint num="23" id="1824" />
-<TGConnectingPoint num="24" id="1825" />
-<TGConnectingPoint num="25" id="1826" />
-<TGConnectingPoint num="26" id="1827" />
-<TGConnectingPoint num="27" id="1828" />
-<TGConnectingPoint num="28" id="1829" />
-<TGConnectingPoint num="29" id="1830" />
-<TGConnectingPoint num="30" id="1831" />
-<TGConnectingPoint num="31" id="1832" />
-<TGConnectingPoint num="32" id="1833" />
-<TGConnectingPoint num="33" id="1834" />
-<TGConnectingPoint num="34" id="1835" />
-<TGConnectingPoint num="35" id="1836" />
-<TGConnectingPoint num="36" id="1837" />
-<TGConnectingPoint num="37" id="1838" />
-<TGConnectingPoint num="38" id="1839" />
-<TGConnectingPoint num="39" id="1840" />
-<TGConnectingPoint num="40" id="1841" />
-<TGConnectingPoint num="41" id="1842" />
-<TGConnectingPoint num="42" id="1843" />
-<TGConnectingPoint num="43" id="1844" />
-<TGConnectingPoint num="44" id="1845" />
-<TGConnectingPoint num="45" id="1846" />
-<TGConnectingPoint num="46" id="1847" />
-<TGConnectingPoint num="47" id="1848" />
-<TGConnectingPoint num="48" id="1849" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="606" id="1918" >
-<cdparam x="870" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECUKM" />
-<TGConnectingPoint num="0" id="1869" />
-<TGConnectingPoint num="1" id="1870" />
-<TGConnectingPoint num="2" id="1871" />
-<TGConnectingPoint num="3" id="1872" />
-<TGConnectingPoint num="4" id="1873" />
-<TGConnectingPoint num="5" id="1874" />
-<TGConnectingPoint num="6" id="1875" />
-<TGConnectingPoint num="7" id="1876" />
-<TGConnectingPoint num="8" id="1877" />
-<TGConnectingPoint num="9" id="1878" />
-<TGConnectingPoint num="10" id="1879" />
-<TGConnectingPoint num="11" id="1880" />
-<TGConnectingPoint num="12" id="1881" />
-<TGConnectingPoint num="13" id="1882" />
-<TGConnectingPoint num="14" id="1883" />
-<TGConnectingPoint num="15" id="1884" />
-<TGConnectingPoint num="16" id="1885" />
-<TGConnectingPoint num="17" id="1886" />
-<TGConnectingPoint num="18" id="1887" />
-<TGConnectingPoint num="19" id="1888" />
-<TGConnectingPoint num="20" id="1889" />
-<TGConnectingPoint num="21" id="1890" />
-<TGConnectingPoint num="22" id="1891" />
-<TGConnectingPoint num="23" id="1892" />
-<TGConnectingPoint num="24" id="1893" />
-<TGConnectingPoint num="25" id="1894" />
-<TGConnectingPoint num="26" id="1895" />
-<TGConnectingPoint num="27" id="1896" />
-<TGConnectingPoint num="28" id="1897" />
-<TGConnectingPoint num="29" id="1898" />
-<TGConnectingPoint num="30" id="1899" />
-<TGConnectingPoint num="31" id="1900" />
-<TGConnectingPoint num="32" id="1901" />
-<TGConnectingPoint num="33" id="1902" />
-<TGConnectingPoint num="34" id="1903" />
-<TGConnectingPoint num="35" id="1904" />
-<TGConnectingPoint num="36" id="1905" />
-<TGConnectingPoint num="37" id="1906" />
-<TGConnectingPoint num="38" id="1907" />
-<TGConnectingPoint num="39" id="1908" />
-<TGConnectingPoint num="40" id="1909" />
-<TGConnectingPoint num="41" id="1910" />
-<TGConnectingPoint num="42" id="1911" />
-<TGConnectingPoint num="43" id="1912" />
-<TGConnectingPoint num="44" id="1913" />
-<TGConnectingPoint num="45" id="1914" />
-<TGConnectingPoint num="46" id="1915" />
-<TGConnectingPoint num="47" id="1916" />
-<TGConnectingPoint num="48" id="1917" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="603" id="1859" >
-<father id="1918" num="0" />
-<cdparam x="888" y="421" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timer2, duration=22}" />
-<TGConnectingPoint num="0" id="1851" />
-<TGConnectingPoint num="1" id="1852" />
-<TGConnectingPoint num="2" id="1853" />
-<TGConnectingPoint num="3" id="1854" />
-<TGConnectingPoint num="4" id="1855" />
-<TGConnectingPoint num="5" id="1856" />
-<TGConnectingPoint num="6" id="1857" />
-<TGConnectingPoint num="7" id="1858" />
-<extraparam>
-<Interval timer="timer2" duration="22" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="604" id="1868" >
-<father id="1918" num="1" />
-<cdparam x="888" y="537" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer cancellation" value="{timer=timer2}" />
-<TGConnectingPoint num="0" id="1860" />
-<TGConnectingPoint num="1" id="1861" />
-<TGConnectingPoint num="2" id="1862" />
-<TGConnectingPoint num="3" id="1863" />
-<TGConnectingPoint num="4" id="1864" />
-<TGConnectingPoint num="5" id="1865" />
-<TGConnectingPoint num="6" id="1866" />
-<TGConnectingPoint num="7" id="1867" />
-<extraparam>
-<Interval timer="timer2" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="606" id="1986" >
-<cdparam x="221" y="186" />
-<sizeparam width="10" height="500" minWidth="10" minHeight="250" maxWidth="10" maxHeight="1500" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="instance" value="ECU1" />
-<TGConnectingPoint num="0" id="1937" />
-<TGConnectingPoint num="1" id="1938" />
-<TGConnectingPoint num="2" id="1939" />
-<TGConnectingPoint num="3" id="1940" />
-<TGConnectingPoint num="4" id="1941" />
-<TGConnectingPoint num="5" id="1942" />
-<TGConnectingPoint num="6" id="1943" />
-<TGConnectingPoint num="7" id="1944" />
-<TGConnectingPoint num="8" id="1945" />
-<TGConnectingPoint num="9" id="1946" />
-<TGConnectingPoint num="10" id="1947" />
-<TGConnectingPoint num="11" id="1948" />
-<TGConnectingPoint num="12" id="1949" />
-<TGConnectingPoint num="13" id="1950" />
-<TGConnectingPoint num="14" id="1951" />
-<TGConnectingPoint num="15" id="1952" />
-<TGConnectingPoint num="16" id="1953" />
-<TGConnectingPoint num="17" id="1954" />
-<TGConnectingPoint num="18" id="1955" />
-<TGConnectingPoint num="19" id="1956" />
-<TGConnectingPoint num="20" id="1957" />
-<TGConnectingPoint num="21" id="1958" />
-<TGConnectingPoint num="22" id="1959" />
-<TGConnectingPoint num="23" id="1960" />
-<TGConnectingPoint num="24" id="1961" />
-<TGConnectingPoint num="25" id="1962" />
-<TGConnectingPoint num="26" id="1963" />
-<TGConnectingPoint num="27" id="1964" />
-<TGConnectingPoint num="28" id="1965" />
-<TGConnectingPoint num="29" id="1966" />
-<TGConnectingPoint num="30" id="1967" />
-<TGConnectingPoint num="31" id="1968" />
-<TGConnectingPoint num="32" id="1969" />
-<TGConnectingPoint num="33" id="1970" />
-<TGConnectingPoint num="34" id="1971" />
-<TGConnectingPoint num="35" id="1972" />
-<TGConnectingPoint num="36" id="1973" />
-<TGConnectingPoint num="37" id="1974" />
-<TGConnectingPoint num="38" id="1975" />
-<TGConnectingPoint num="39" id="1976" />
-<TGConnectingPoint num="40" id="1977" />
-<TGConnectingPoint num="41" id="1978" />
-<TGConnectingPoint num="42" id="1979" />
-<TGConnectingPoint num="43" id="1980" />
-<TGConnectingPoint num="44" id="1981" />
-<TGConnectingPoint num="45" id="1982" />
-<TGConnectingPoint num="46" id="1983" />
-<TGConnectingPoint num="47" id="1984" />
-<TGConnectingPoint num="48" id="1985" />
-<extraparam>
-<Actor data="false" />
-</extraparam>
-</COMPONENT>
-<SUBCOMPONENT type="604" id="1927" >
-<father id="1986" num="0" />
-<cdparam x="239" y="611" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="timer cancellation" value="{timer=timer1}" />
-<TGConnectingPoint num="0" id="1919" />
-<TGConnectingPoint num="1" id="1920" />
-<TGConnectingPoint num="2" id="1921" />
-<TGConnectingPoint num="3" id="1922" />
-<TGConnectingPoint num="4" id="1923" />
-<TGConnectingPoint num="5" id="1924" />
-<TGConnectingPoint num="6" id="1925" />
-<TGConnectingPoint num="7" id="1926" />
-<extraparam>
-<Interval timer="timer1" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="603" id="1936" >
-<father id="1986" num="1" />
-<cdparam x="239" y="322" />
-<sizeparam width="15" height="25" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="18" maxX="18" minY="-2" maxY="478" />
-<infoparam name="setting timer" value="{timer=timer1, duration=64}" />
-<TGConnectingPoint num="0" id="1928" />
-<TGConnectingPoint num="1" id="1929" />
-<TGConnectingPoint num="2" id="1930" />
-<TGConnectingPoint num="3" id="1931" />
-<TGConnectingPoint num="4" id="1932" />
-<TGConnectingPoint num="5" id="1933" />
-<TGConnectingPoint num="6" id="1934" />
-<TGConnectingPoint num="7" id="1935" />
-<extraparam>
-<Interval timer="timer1" duration="64" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="301" id="2003" >
-<cdparam x="765" y="64" />
-<sizeparam width="235" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECUKM:
-PSK-1: Private symmetric key ECU1.
-PSK-N: Private symmetric key ECUN..
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="1987" />
-<TGConnectingPoint num="1" id="1988" />
-<TGConnectingPoint num="2" id="1989" />
-<TGConnectingPoint num="3" id="1990" />
-<TGConnectingPoint num="4" id="1991" />
-<TGConnectingPoint num="5" id="1992" />
-<TGConnectingPoint num="6" id="1993" />
-<TGConnectingPoint num="7" id="1994" />
-<TGConnectingPoint num="8" id="1995" />
-<TGConnectingPoint num="9" id="1996" />
-<TGConnectingPoint num="10" id="1997" />
-<TGConnectingPoint num="11" id="1998" />
-<TGConnectingPoint num="12" id="1999" />
-<TGConnectingPoint num="13" id="2000" />
-<TGConnectingPoint num="14" id="2001" />
-<TGConnectingPoint num="15" id="2002" />
-<extraparam>
-<Line value="Initial Knowledge ECUKM:" />
-<Line value="PSK-1: Private symmetric key ECU1." />
-<Line value="PSK-N: Private symmetric key ECUN.." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2020" >
-<cdparam x="914" y="580" />
-<sizeparam width="325" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM verifies integrity, authenticity and freshness
-in the acknowledgement message. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="2004" />
-<TGConnectingPoint num="1" id="2005" />
-<TGConnectingPoint num="2" id="2006" />
-<TGConnectingPoint num="3" id="2007" />
-<TGConnectingPoint num="4" id="2008" />
-<TGConnectingPoint num="5" id="2009" />
-<TGConnectingPoint num="6" id="2010" />
-<TGConnectingPoint num="7" id="2011" />
-<TGConnectingPoint num="8" id="2012" />
-<TGConnectingPoint num="9" id="2013" />
-<TGConnectingPoint num="10" id="2014" />
-<TGConnectingPoint num="11" id="2015" />
-<TGConnectingPoint num="12" id="2016" />
-<TGConnectingPoint num="13" id="2017" />
-<TGConnectingPoint num="14" id="2018" />
-<TGConnectingPoint num="15" id="2019" />
-<extraparam>
-<Line value="ECUKM verifies integrity, authenticity and freshness" />
-<Line value="in the acknowledgement message. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2037" >
-<cdparam x="1067" y="429" />
-<sizeparam width="311" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUN informs ECUKM that the session key has
-been accepted and thus stored. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="2021" />
-<TGConnectingPoint num="1" id="2022" />
-<TGConnectingPoint num="2" id="2023" />
-<TGConnectingPoint num="3" id="2024" />
-<TGConnectingPoint num="4" id="2025" />
-<TGConnectingPoint num="5" id="2026" />
-<TGConnectingPoint num="6" id="2027" />
-<TGConnectingPoint num="7" id="2028" />
-<TGConnectingPoint num="8" id="2029" />
-<TGConnectingPoint num="9" id="2030" />
-<TGConnectingPoint num="10" id="2031" />
-<TGConnectingPoint num="11" id="2032" />
-<TGConnectingPoint num="12" id="2033" />
-<TGConnectingPoint num="13" id="2034" />
-<TGConnectingPoint num="14" id="2035" />
-<TGConnectingPoint num="15" id="2036" />
-<extraparam>
-<Line value="ECUN informs ECUKM that the session key has" />
-<Line value="been accepted and thus stored. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2054" >
-<cdparam x="1054" y="300" />
-<sizeparam width="334" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECUKM distributes the new sesssion key among 
-the members of the group. The message interchanges
-between ECUKM and ECUN should be repeated 
-with each member of the group.
-" />
-<TGConnectingPoint num="0" id="2038" />
-<TGConnectingPoint num="1" id="2039" />
-<TGConnectingPoint num="2" id="2040" />
-<TGConnectingPoint num="3" id="2041" />
-<TGConnectingPoint num="4" id="2042" />
-<TGConnectingPoint num="5" id="2043" />
-<TGConnectingPoint num="6" id="2044" />
-<TGConnectingPoint num="7" id="2045" />
-<TGConnectingPoint num="8" id="2046" />
-<TGConnectingPoint num="9" id="2047" />
-<TGConnectingPoint num="10" id="2048" />
-<TGConnectingPoint num="11" id="2049" />
-<TGConnectingPoint num="12" id="2050" />
-<TGConnectingPoint num="13" id="2051" />
-<TGConnectingPoint num="14" id="2052" />
-<TGConnectingPoint num="15" id="2053" />
-<extraparam>
-<Line value="ECUKM distributes the new sesssion key among " />
-<Line value="the members of the group. The message interchanges" />
-<Line value="between ECUKM and ECUN should be repeated " />
-<Line value="with each member of the group." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2071" >
-<cdparam x="1303" y="62" />
-<sizeparam width="235" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECUN:
-PSK-N: Private symmetric key ECUN..
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="2055" />
-<TGConnectingPoint num="1" id="2056" />
-<TGConnectingPoint num="2" id="2057" />
-<TGConnectingPoint num="3" id="2058" />
-<TGConnectingPoint num="4" id="2059" />
-<TGConnectingPoint num="5" id="2060" />
-<TGConnectingPoint num="6" id="2061" />
-<TGConnectingPoint num="7" id="2062" />
-<TGConnectingPoint num="8" id="2063" />
-<TGConnectingPoint num="9" id="2064" />
-<TGConnectingPoint num="10" id="2065" />
-<TGConnectingPoint num="11" id="2066" />
-<TGConnectingPoint num="12" id="2067" />
-<TGConnectingPoint num="13" id="2068" />
-<TGConnectingPoint num="14" id="2069" />
-<TGConnectingPoint num="15" id="2070" />
-<extraparam>
-<Line value="Initial Knowledge ECUN:" />
-<Line value="PSK-N: Private symmetric key ECUN.." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2088" >
-<cdparam x="91" y="54" />
-<sizeparam width="240" height="51" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="Initial Knowledge ECU1:
-PSK-1: Private symmetric key ECU1.
-SesK: Random generated session key.
-GroupNo: Fix group number.
-" />
-<TGConnectingPoint num="0" id="2072" />
-<TGConnectingPoint num="1" id="2073" />
-<TGConnectingPoint num="2" id="2074" />
-<TGConnectingPoint num="3" id="2075" />
-<TGConnectingPoint num="4" id="2076" />
-<TGConnectingPoint num="5" id="2077" />
-<TGConnectingPoint num="6" id="2078" />
-<TGConnectingPoint num="7" id="2079" />
-<TGConnectingPoint num="8" id="2080" />
-<TGConnectingPoint num="9" id="2081" />
-<TGConnectingPoint num="10" id="2082" />
-<TGConnectingPoint num="11" id="2083" />
-<TGConnectingPoint num="12" id="2084" />
-<TGConnectingPoint num="13" id="2085" />
-<TGConnectingPoint num="14" id="2086" />
-<TGConnectingPoint num="15" id="2087" />
-<extraparam>
-<Line value="Initial Knowledge ECU1:" />
-<Line value="PSK-1: Private symmetric key ECU1." />
-<Line value="SesK: Random generated session key." />
-<Line value="GroupNo: Fix group number." />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="2105" >
-<cdparam x="250" y="644" />
-<sizeparam width="325" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2400" minY="10" maxY="900" />
-<infoparam name="UML Note" value="ECU1 verifies integrity, authenticity and freshness
-in the acknowledgement message. The older session
-key is deleted in case there is one.
-" />
-<TGConnectingPoint num="0" id="2089" />
-<TGConnectingPoint num="1" id="2090" />
-<TGConnectingPoint num="2" id="2091" />
-<TGConnectingPoint num="3" id="2092" />
-<TGConnectingPoint num="4" id="2093" />
-<TGConnectingPoint num="5" id="2094" />
-<TGConnectingPoint num="6" id="2095" />
-<TGConnectingPoint num="7" id="2096" />
-<TGConnectingPoint num="8" id="2097" />
-<TGConnectingPoint num="9" id="2098" />
-<TGConnectingPoint num="10" id="2099" />
-<TGConnectingPoint num="11" id="2100" />
-<TGConnectingPoint num="12" id="2101" />
-<TGConnectingPoint num="13" id="2102" />
-<TGConnectingPoint num="14" id="2103" />
-<TGConnectingPoint num="15" id="2104" />
-<extraparam>
-<Line value="ECU1 verifies integrity, authenticity and freshness" />
-<Line value="in the acknowledgement message. The older session" />
-<Line value="key is deleted in case there is one." />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="106" id="2106" >
-<cdparam x="833" y="536" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M4:={ACKcode, timeStamp4}, MAC(M4, PSK-1)]" />
-<P1  x="875" y="596" id="1909" />
-<P2  x="226" y="596" id="1977" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="106" id="2107" >
-<cdparam x="1338" y="466" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M3:={ACKcode, timeStamp3}, MAC(M3, PSK-N)]" />
-<P1  x="1482" y="526" id="1834" />
-<P2  x="875" y="526" id="1902" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="107" id="2108" >
-<cdparam x="793" y="396" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value="[M2:={{SesK}_{PSK-N}, GroupNo, timeStamp2}, MAC(M2,PSK-N)]" />
-<P1  x="875" y="406" id="1890" />
-<P2  x="1482" y="406" id="1822" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
-<CONNECTOR type="107" id="2109" >
-<cdparam x="323" y="286" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from instance to instance" value=" [M1:={{SesK}_{SesK}, GroupNo, timeStamp1}, MAC(M1,PSK-1)]" />
-<P1  x="226" y="306" id="1948" />
-<P2  x="875" y="306" id="1880" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR>
+<SequenceDiagramPanelZV name="SesK distribution" minX="10" maxX="2500" minY="10" maxY="1500" >
 
-</SequenceDiagramPanel>
+</SequenceDiagramPanelZV>
 
 </Modeling>
 
@@ -4148,45 +3558,45 @@ all subblocks
 <TGConnectingPoint num="23" id="2267" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="false" />
+<Signal value="out chout(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="2193" >
+<SUBCOMPONENT type="5000" id="2243" >
 <father id="2268" num="0" />
-<cdparam x="276" y="229" />
-<sizeparam width="189" height="228" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="478" y="230" />
+<sizeparam width="215" height="228" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="438" minY="0" maxY="43" />
-<infoparam name="Block0" value="KM" />
-<TGConnectingPoint num="0" id="2169" />
-<TGConnectingPoint num="1" id="2170" />
-<TGConnectingPoint num="2" id="2171" />
-<TGConnectingPoint num="3" id="2172" />
-<TGConnectingPoint num="4" id="2173" />
-<TGConnectingPoint num="5" id="2174" />
-<TGConnectingPoint num="6" id="2175" />
-<TGConnectingPoint num="7" id="2176" />
-<TGConnectingPoint num="8" id="2177" />
-<TGConnectingPoint num="9" id="2178" />
-<TGConnectingPoint num="10" id="2179" />
-<TGConnectingPoint num="11" id="2180" />
-<TGConnectingPoint num="12" id="2181" />
-<TGConnectingPoint num="13" id="2182" />
-<TGConnectingPoint num="14" id="2183" />
-<TGConnectingPoint num="15" id="2184" />
-<TGConnectingPoint num="16" id="2185" />
-<TGConnectingPoint num="17" id="2186" />
-<TGConnectingPoint num="18" id="2187" />
-<TGConnectingPoint num="19" id="2188" />
-<TGConnectingPoint num="20" id="2189" />
-<TGConnectingPoint num="21" id="2190" />
-<TGConnectingPoint num="22" id="2191" />
-<TGConnectingPoint num="23" id="2192" />
+<cdrectangleparam minX="0" maxX="412" minY="0" maxY="43" />
+<infoparam name="Block0" value="ECUN" />
+<TGConnectingPoint num="0" id="2219" />
+<TGConnectingPoint num="1" id="2220" />
+<TGConnectingPoint num="2" id="2221" />
+<TGConnectingPoint num="3" id="2222" />
+<TGConnectingPoint num="4" id="2223" />
+<TGConnectingPoint num="5" id="2224" />
+<TGConnectingPoint num="6" id="2225" />
+<TGConnectingPoint num="7" id="2226" />
+<TGConnectingPoint num="8" id="2227" />
+<TGConnectingPoint num="9" id="2228" />
+<TGConnectingPoint num="10" id="2229" />
+<TGConnectingPoint num="11" id="2230" />
+<TGConnectingPoint num="12" id="2231" />
+<TGConnectingPoint num="13" id="2232" />
+<TGConnectingPoint num="14" id="2233" />
+<TGConnectingPoint num="15" id="2234" />
+<TGConnectingPoint num="16" id="2235" />
+<TGConnectingPoint num="17" id="2236" />
+<TGConnectingPoint num="18" id="2237" />
+<TGConnectingPoint num="19" id="2238" />
+<TGConnectingPoint num="20" id="2239" />
+<TGConnectingPoint num="21" id="2240" />
+<TGConnectingPoint num="22" id="2241" />
+<TGConnectingPoint num="23" id="2242" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
@@ -4194,15 +3604,10 @@ all subblocks
 <Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg7" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timestamp1" value="" type="8" typeOther="" />
-<Attribute access="0" id="timestamp2" value="" type="8" typeOther="" />
+<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
 <Attribute access="0" id="ACK" value="" type="8" typeOther="" />
 <Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msg8" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="msgauth" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -4215,12 +3620,22 @@ all subblocks
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2218" >
-<father id="2268" num="1" />
-<cdparam x="93" y="282" />
-<sizeparam width="177" height="176" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5000" id="2218" >
+<father id="2268" num="1" />
+<cdparam x="93" y="282" />
+<sizeparam width="177" height="176" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="450" minY="0" maxY="95" />
 <infoparam name="Block0" value="ECU1" />
@@ -4249,7 +3664,7 @@ all subblocks
 <TGConnectingPoint num="22" id="2216" />
 <TGConnectingPoint num="23" id="2217" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="msga" value="" type="5" typeOther="Message" />
@@ -4277,43 +3692,53 @@ all subblocks
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="2243" >
+<SUBCOMPONENT type="5000" id="2193" >
 <father id="2268" num="2" />
-<cdparam x="478" y="230" />
-<sizeparam width="215" height="228" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="276" y="229" />
+<sizeparam width="189" height="228" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="412" minY="0" maxY="43" />
-<infoparam name="Block0" value="ECUN" />
-<TGConnectingPoint num="0" id="2219" />
-<TGConnectingPoint num="1" id="2220" />
-<TGConnectingPoint num="2" id="2221" />
-<TGConnectingPoint num="3" id="2222" />
-<TGConnectingPoint num="4" id="2223" />
-<TGConnectingPoint num="5" id="2224" />
-<TGConnectingPoint num="6" id="2225" />
-<TGConnectingPoint num="7" id="2226" />
-<TGConnectingPoint num="8" id="2227" />
-<TGConnectingPoint num="9" id="2228" />
-<TGConnectingPoint num="10" id="2229" />
-<TGConnectingPoint num="11" id="2230" />
-<TGConnectingPoint num="12" id="2231" />
-<TGConnectingPoint num="13" id="2232" />
-<TGConnectingPoint num="14" id="2233" />
-<TGConnectingPoint num="15" id="2234" />
-<TGConnectingPoint num="16" id="2235" />
-<TGConnectingPoint num="17" id="2236" />
-<TGConnectingPoint num="18" id="2237" />
-<TGConnectingPoint num="19" id="2238" />
-<TGConnectingPoint num="20" id="2239" />
-<TGConnectingPoint num="21" id="2240" />
-<TGConnectingPoint num="22" id="2241" />
-<TGConnectingPoint num="23" id="2242" />
+<cdrectangleparam minX="0" maxX="438" minY="0" maxY="43" />
+<infoparam name="Block0" value="KM" />
+<TGConnectingPoint num="0" id="2169" />
+<TGConnectingPoint num="1" id="2170" />
+<TGConnectingPoint num="2" id="2171" />
+<TGConnectingPoint num="3" id="2172" />
+<TGConnectingPoint num="4" id="2173" />
+<TGConnectingPoint num="5" id="2174" />
+<TGConnectingPoint num="6" id="2175" />
+<TGConnectingPoint num="7" id="2176" />
+<TGConnectingPoint num="8" id="2177" />
+<TGConnectingPoint num="9" id="2178" />
+<TGConnectingPoint num="10" id="2179" />
+<TGConnectingPoint num="11" id="2180" />
+<TGConnectingPoint num="12" id="2181" />
+<TGConnectingPoint num="13" id="2182" />
+<TGConnectingPoint num="14" id="2183" />
+<TGConnectingPoint num="15" id="2184" />
+<TGConnectingPoint num="16" id="2185" />
+<TGConnectingPoint num="17" id="2186" />
+<TGConnectingPoint num="18" id="2187" />
+<TGConnectingPoint num="19" id="2188" />
+<TGConnectingPoint num="20" id="2189" />
+<TGConnectingPoint num="21" id="2190" />
+<TGConnectingPoint num="22" id="2191" />
+<TGConnectingPoint num="23" id="2192" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="PSKN" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="keyOfGroup" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="PSK1" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="msg" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg2" value="" type="5" typeOther="Message" />
@@ -4321,10 +3746,15 @@ all subblocks
 <Attribute access="0" id="msg4" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg5" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="msg6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="timestamp" value="" type="8" typeOther="" />
+<Attribute access="0" id="msg7" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="timestamp1" value="" type="8" typeOther="" />
+<Attribute access="0" id="timestamp2" value="" type="8" typeOther="" />
 <Attribute access="0" id="ACK" value="" type="8" typeOther="" />
 <Attribute access="0" id="b" value="" type="4" typeOther="" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="timerexpire" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="settimer" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msg8" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="msgauth" value="" type="5" typeOther="Message" />
 <Method value="Message encrypt(Message msg, Key k)" />
 <Method value="Message decrypt(Message msg, Key k)" />
 <Method value="Message sencrypt(Message msg, Key k)" />
@@ -4337,6 +3767,16 @@ all subblocks
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Message aencrypt(Message msg, Key k)" />
+<Method value="Message adecrypt(Message msg, Key k)" />
+<Method value="Key pk(Key k)" />
+<Method value="Message sign(Message msg, Key k)" />
+<Method value="bool verifySign(Message msg1, Message sig, Key k)" />
+<Method value="Message cert(Key k, Message msg)" />
+<Method value="bool verifyCert(Message cert, Key k)" />
+<Method value="Key getpk(Message cert)" />
+<Method value="Key DH(Key pubK, Key privK)" />
+<Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -4356,86 +3796,86 @@ all subblocks
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="2277" >
-<cdparam x="638" y="1030" />
+<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
+<CONNECTOR type="5102" id="3255" >
+<cdparam x="621" y="895" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2276" />
-<P1  x="638" y="1030" id="2452" />
-<P2  x="656" y="1133" id="2365" />
+<TGConnectingPoint num="0" id="3254" />
+<P1  x="458" y="749" id="3382" />
+<P2  x="425" y="798" id="3410" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2275" >
-<father id="2277" num="0" />
-<cdparam x="654" y="1057" />
-<sizeparam width="217" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3253" >
+<father id="3255" num="0" />
+<cdparam x="270" y="771" />
+<sizeparam width="191" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2271" />
-<TGConnectingPoint num="1" id="2272" />
-<TGConnectingPoint num="2" id="2273" />
-<TGConnectingPoint num="3" id="2274" />
+<TGConnectingPoint num="0" id="3249" />
+<TGConnectingPoint num="1" id="3250" />
+<TGConnectingPoint num="2" id="3251" />
+<TGConnectingPoint num="3" id="3252" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[msg.data == timerexpire.data ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
-<actions value="secretData = msg3.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2284" >
-<cdparam x="514" y="919" />
+<CONNECTOR type="5102" id="3262" >
+<cdparam x="654" y="890" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2283" />
-<P1  x="514" y="919" id="2501" />
-<P2  x="417" y="985" id="2406" />
+<TGConnectingPoint num="0" id="3261" />
+<P1  x="488" y="749" id="3374" />
+<P2  x="611" y="797" id="3596" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2282" >
-<father id="2284" num="0" />
-<cdparam x="413" y="957" />
-<sizeparam width="46" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3260" >
+<father id="3262" num="0" />
+<cdparam x="581" y="749" />
+<sizeparam width="217" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2278" />
-<TGConnectingPoint num="1" id="2279" />
-<TGConnectingPoint num="2" id="2280" />
-<TGConnectingPoint num="3" id="2281" />
+<TGConnectingPoint num="0" id="3256" />
+<TGConnectingPoint num="1" id="3257" />
+<TGConnectingPoint num="2" id="3258" />
+<TGConnectingPoint num="3" id="3259" />
 <extraparam>
-<guard value="[ not(b)]" />
+<guard value="[not(msg.data == timerexpire.data) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg, msg5, msg4)" />
+<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2291" >
-<cdparam x="570" y="919" />
+<CONNECTOR type="5102" id="3269" >
+<cdparam x="524" y="710" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2290" />
-<P1  x="570" y="919" id="2502" />
-<P2  x="638" y="990" id="2447" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3268" />
+<P1  x="489" y="594" id="3451" />
+<P2  x="488" y="613" id="3771" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2289" >
-<father id="2291" num="0" />
-<cdparam x="570" y="959" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3267" >
+<father id="3269" num="0" />
+<cdparam x="524" y="750" />
+<sizeparam width="10" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2285" />
-<TGConnectingPoint num="1" id="2286" />
-<TGConnectingPoint num="2" id="2287" />
-<TGConnectingPoint num="3" id="2288" />
+<TGConnectingPoint num="0" id="3263" />
+<TGConnectingPoint num="1" id="3264" />
+<TGConnectingPoint num="2" id="3265" />
+<TGConnectingPoint num="3" id="3266" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4443,113 +3883,118 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2298" >
-<cdparam x="342" y="72" />
+<CONNECTOR type="5102" id="3276" >
+<cdparam x="988" y="1206" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2297" />
-<P1  x="342" y="72" id="2692" />
-<P2  x="342" y="100" id="2652" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3275" />
+<P1  x="611" y="980" id="3519" />
+<P2  x="611" y="1068" id="3461" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2296" >
-<father id="2298" num="0" />
-<cdparam x="342" y="112" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3274" >
+<father id="3276" num="0" />
+<cdparam x="625" y="998" />
+<sizeparam width="175" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2292" />
-<TGConnectingPoint num="1" id="2293" />
-<TGConnectingPoint num="2" id="2294" />
-<TGConnectingPoint num="3" id="2295" />
+<TGConnectingPoint num="0" id="3270" />
+<TGConnectingPoint num="1" id="3271" />
+<TGConnectingPoint num="2" id="3272" />
+<TGConnectingPoint num="3" id="3273" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp2" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSK1)" />
+<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2305" >
-<cdparam x="548" y="792" />
+<CONNECTOR type="5102" id="3283" >
+<cdparam x="427" y="156" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="2304" />
-<P1  x="548" y="792" id="2706" />
-<P2  x="542" y="879" id="2488" />
+<infoparam name="connector from start state to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3282" />
+<P1  x="398" y="124" id="3915" />
+<P2  x="398" y="137" id="3904" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2303" >
-<father id="2305" num="0" />
-<cdparam x="548" y="832" />
-<sizeparam width="240" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2299" />
-<TGConnectingPoint num="1" id="2300" />
-<TGConnectingPoint num="2" id="2301" />
-<TGConnectingPoint num="3" id="2302" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3281" >
+<father id="3283" num="0" />
+<cdparam x="427" y="196" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3277" />
+<TGConnectingPoint num="1" id="3278" />
+<TGConnectingPoint num="2" id="3279" />
+<TGConnectingPoint num="3" id="3280" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg1, msg2)" />
-<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2312" >
-<cdparam x="434" y="475" />
+<CONNECTOR type="5102" id="3290" >
+<cdparam x="472" y="500" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="2311" />
-<P1  x="479" y="445" id="2783" />
-<P2  x="530" y="495" id="2611" />
+<TGConnectingPoint num="0" id="3289" />
+<P1  x="489" y="376" id="3642" />
+<P2  x="489" y="426" id="3678" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2310" >
-<father id="2312" num="0" />
-<cdparam x="529" y="457" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3288" >
+<father id="3290" num="0" />
+<cdparam x="513" y="397" />
+<sizeparam width="190" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2306" />
-<TGConnectingPoint num="1" id="2307" />
-<TGConnectingPoint num="2" id="2308" />
-<TGConnectingPoint num="3" id="2309" />
+<TGConnectingPoint num="0" id="3284" />
+<TGConnectingPoint num="1" id="3285" />
+<TGConnectingPoint num="2" id="3286" />
+<TGConnectingPoint num="3" id="3287" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get3(msg1, msg5, msg2, msg3)" />
+<actions value="msgauth= sdecrypt(msg5, PSK1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2319" >
-<cdparam x="486" y="696" />
+<CONNECTOR type="5102" id="3297" >
+<cdparam x="472" y="500" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2318" />
-<P1  x="543" y="653" id="2758" />
-<P2  x="548" y="688" id="2717" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3296" />
+<P1  x="373" y="292" id="3877" />
+<P2  x="316" y="334" id="3823" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2317" >
-<father id="2319" num="0" />
-<cdparam x="486" y="736" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3295" >
+<father id="3297" num="0" />
+<cdparam x="208" y="317" />
+<sizeparam width="190" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2313" />
-<TGConnectingPoint num="1" id="2314" />
-<TGConnectingPoint num="2" id="2315" />
-<TGConnectingPoint num="3" id="2316" />
+<TGConnectingPoint num="0" id="3291" />
+<TGConnectingPoint num="1" id="3292" />
+<TGConnectingPoint num="2" id="3293" />
+<TGConnectingPoint num="3" id="3294" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[not(msg8.data == msg4.data) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -4557,25 +4002,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2326" >
-<cdparam x="548" y="728" />
+<CONNECTOR type="5102" id="3304" >
+<cdparam x="517" y="650" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2325" />
-<P1  x="548" y="728" id="2722" />
-<P2  x="548" y="762" id="2705" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3303" />
+<P1  x="489" y="563" id="3812" />
+<P2  x="489" y="564" id="3450" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2324" >
-<father id="2326" num="0" />
-<cdparam x="548" y="768" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3302" >
+<father id="3304" num="0" />
+<cdparam x="517" y="690" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2320" />
-<TGConnectingPoint num="1" id="2321" />
-<TGConnectingPoint num="2" id="2322" />
-<TGConnectingPoint num="3" id="2323" />
+<TGConnectingPoint num="0" id="3298" />
+<TGConnectingPoint num="1" id="3299" />
+<TGConnectingPoint num="2" id="3300" />
+<TGConnectingPoint num="3" id="3301" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4585,54 +4030,53 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2333" >
-<cdparam x="304" y="307" />
+<CONNECTOR type="5102" id="3311" >
+<cdparam x="710" y="775" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="2332" />
-<P1  x="429" y="362" id="2534" />
-<P2  x="454" y="405" id="2769" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3310" />
+<P1  x="488" y="689" id="3760" />
+<P2  x="488" y="709" id="3369" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2331" >
-<father id="2333" num="0" />
-<cdparam x="440" y="381" />
-<sizeparam width="201" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3309" >
+<father id="3311" num="0" />
+<cdparam x="685" y="829" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2327" />
-<TGConnectingPoint num="1" id="2328" />
-<TGConnectingPoint num="2" id="2329" />
-<TGConnectingPoint num="3" id="2330" />
+<TGConnectingPoint num="0" id="3305" />
+<TGConnectingPoint num="1" id="3306" />
+<TGConnectingPoint num="2" id="3307" />
+<TGConnectingPoint num="3" id="3308" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2340" >
-<cdparam x="342" y="140" />
+<CONNECTOR type="5102" id="3318" >
+<cdparam x="413" y="171" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2339" />
-<P1  x="342" y="140" id="2657" />
-<P2  x="350" y="173" id="2694" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3317" />
+<P1  x="398" y="167" id="3905" />
+<P2  x="398" y="177" id="3719" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2338" >
-<father id="2340" num="0" />
-<cdparam x="342" y="180" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3316" >
+<father id="3318" num="0" />
+<cdparam x="413" y="211" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2334" />
-<TGConnectingPoint num="1" id="2335" />
-<TGConnectingPoint num="2" id="2336" />
-<TGConnectingPoint num="3" id="2337" />
+<TGConnectingPoint num="0" id="3312" />
+<TGConnectingPoint num="1" id="3313" />
+<TGConnectingPoint num="2" id="3314" />
+<TGConnectingPoint num="3" id="3315" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -4642,948 +4086,1186 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2347" >
-<cdparam x="518" y="526" />
+<CONNECTOR type="5102" id="3325" >
+<cdparam x="820" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2346" />
-<P1  x="530" y="535" id="2616" />
-<P2  x="543" y="623" id="2757" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="3324" />
+<P1  x="611" y="837" id="3601" />
+<P2  x="611" y="874" id="3555" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2345" >
-<father id="2347" num="0" />
-<cdparam x="565" y="553" />
-<sizeparam width="179" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3323" >
+<father id="3325" num="0" />
+<cdparam x="626" y="851" />
+<sizeparam width="186" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2341" />
-<TGConnectingPoint num="1" id="2342" />
-<TGConnectingPoint num="2" id="2343" />
-<TGConnectingPoint num="3" id="2344" />
+<TGConnectingPoint num="0" id="3319" />
+<TGConnectingPoint num="1" id="3320" />
+<TGConnectingPoint num="2" id="3321" />
+<TGConnectingPoint num="3" id="3322" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[  ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="keyOfGroup.data = msg1.data" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSKN)" />
-<actions value="msg = concat2(msg3, msg4)" />
+<actions value="get3(msg5, msg1, msg2, msg3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2354" >
-<cdparam x="350" y="203" />
+<CONNECTOR type="5102" id="3332" >
+<cdparam x="420" y="415" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2353" />
-<P1  x="350" y="203" id="2695" />
-<P2  x="406" y="238" id="2570" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3331" />
+<P1  x="398" y="217" id="3724" />
+<P2  x="398" y="252" id="3864" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2352" >
-<father id="2354" num="0" />
-<cdparam x="350" y="243" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3330" >
+<father id="3332" num="0" />
+<cdparam x="418" y="233" />
+<sizeparam width="153" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2348" />
-<TGConnectingPoint num="1" id="2349" />
-<TGConnectingPoint num="2" id="2350" />
-<TGConnectingPoint num="3" id="2351" />
+<TGConnectingPoint num="0" id="3326" />
+<TGConnectingPoint num="1" id="3327" />
+<TGConnectingPoint num="2" id="3328" />
+<TGConnectingPoint num="3" id="3329" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg8, msg1, msg4)" />
+<actions value="msg8 = MAC(msg1, PSK1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2363" >
-<cdparam x="406" y="268" />
+<CONNECTOR type="5102" id="3339" >
+<cdparam x="967" y="524" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2361" />
-<TGConnectingPoint num="1" id="2362" />
-<P1  x="406" y="268" id="2575" />
-<P2  x="429" y="322" id="2529" />
-<Point x="414" y="282" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3338" />
+<P1  x="489" y="466" id="3683" />
+<P2  x="489" y="533" id="3811" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2355" >
-<father id="2363" num="0" />
-<cdparam x="414" y="282" />
-<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="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="2360" >
-<father id="2363" num="1" />
-<cdparam x="446" y="292" />
-<sizeparam width="226" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3337" >
+<father id="3339" num="0" />
+<cdparam x="532" y="480" />
+<sizeparam width="255" height="75" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2356" />
-<TGConnectingPoint num="1" id="2357" />
-<TGConnectingPoint num="2" id="2358" />
-<TGConnectingPoint num="3" id="2359" />
+<TGConnectingPoint num="0" id="3333" />
+<TGConnectingPoint num="1" id="3334" />
+<TGConnectingPoint num="2" id="3335" />
+<TGConnectingPoint num="3" id="3336" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg5, msg6)" />
-<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
+<actions value="msg7 = sencrypt(msgauth, PSKN)" />
+<actions value="msg3.data = timestamp1" />
+<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
+<actions value="msg4 = MAC(msg1, PSKN)" />
+<actions value="msg=concat2(msg1, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2404" >
-<cdparam x="595" y="1133" />
-<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3346" >
+<cdparam x="433" y="416" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3345" />
+<P1  x="398" y="292" id="3869" />
+<P2  x="489" y="336" id="3637" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3344" >
+<father id="3346" num="0" />
+<cdparam x="465" y="314" />
+<sizeparam width="160" 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="1400" />
-<infoparam name="state0" value="gotData" />
-<TGConnectingPoint num="0" id="2364" />
-<TGConnectingPoint num="1" id="2365" />
-<TGConnectingPoint num="2" id="2366" />
-<TGConnectingPoint num="3" id="2367" />
-<TGConnectingPoint num="4" id="2368" />
-<TGConnectingPoint num="5" id="2369" />
-<TGConnectingPoint num="6" id="2370" />
-<TGConnectingPoint num="7" id="2371" />
-<TGConnectingPoint num="8" id="2372" />
-<TGConnectingPoint num="9" id="2373" />
-<TGConnectingPoint num="10" id="2374" />
-<TGConnectingPoint num="11" id="2375" />
-<TGConnectingPoint num="12" id="2376" />
-<TGConnectingPoint num="13" id="2377" />
-<TGConnectingPoint num="14" id="2378" />
-<TGConnectingPoint num="15" id="2379" />
-<TGConnectingPoint num="16" id="2380" />
-<TGConnectingPoint num="17" id="2381" />
-<TGConnectingPoint num="18" id="2382" />
-<TGConnectingPoint num="19" id="2383" />
-<TGConnectingPoint num="20" id="2384" />
-<TGConnectingPoint num="21" id="2385" />
-<TGConnectingPoint num="22" id="2386" />
-<TGConnectingPoint num="23" id="2387" />
-<TGConnectingPoint num="24" id="2388" />
-<TGConnectingPoint num="25" id="2389" />
-<TGConnectingPoint num="26" id="2390" />
-<TGConnectingPoint num="27" id="2391" />
-<TGConnectingPoint num="28" id="2392" />
-<TGConnectingPoint num="29" id="2393" />
-<TGConnectingPoint num="30" id="2394" />
-<TGConnectingPoint num="31" id="2395" />
-<TGConnectingPoint num="32" id="2396" />
-<TGConnectingPoint num="33" id="2397" />
-<TGConnectingPoint num="34" id="2398" />
-<TGConnectingPoint num="35" id="2399" />
-<TGConnectingPoint num="36" id="2400" />
-<TGConnectingPoint num="37" id="2401" />
-<TGConnectingPoint num="38" id="2402" />
-<TGConnectingPoint num="39" id="2403" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3340" />
+<TGConnectingPoint num="1" id="3341" />
+<TGConnectingPoint num="2" id="3342" />
+<TGConnectingPoint num="3" id="3343" />
 <extraparam>
+<guard value="[msg8.data == msg4.data]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2445" >
-<cdparam x="366" y="985" />
-<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3353" >
+<cdparam x="604" y="757" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="3352" />
+<P1  x="488" y="653" id="3776" />
+<P2  x="488" y="659" id="3759" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3351" >
+<father id="3353" num="0" />
+<cdparam x="604" y="797" />
+<sizeparam width="10" 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="1400" />
-<infoparam name="state0" value="MacDataFailed" />
-<TGConnectingPoint num="0" id="2405" />
-<TGConnectingPoint num="1" id="2406" />
-<TGConnectingPoint num="2" id="2407" />
-<TGConnectingPoint num="3" id="2408" />
-<TGConnectingPoint num="4" id="2409" />
-<TGConnectingPoint num="5" id="2410" />
-<TGConnectingPoint num="6" id="2411" />
-<TGConnectingPoint num="7" id="2412" />
-<TGConnectingPoint num="8" id="2413" />
-<TGConnectingPoint num="9" id="2414" />
-<TGConnectingPoint num="10" id="2415" />
-<TGConnectingPoint num="11" id="2416" />
-<TGConnectingPoint num="12" id="2417" />
-<TGConnectingPoint num="13" id="2418" />
-<TGConnectingPoint num="14" id="2419" />
-<TGConnectingPoint num="15" id="2420" />
-<TGConnectingPoint num="16" id="2421" />
-<TGConnectingPoint num="17" id="2422" />
-<TGConnectingPoint num="18" id="2423" />
-<TGConnectingPoint num="19" id="2424" />
-<TGConnectingPoint num="20" id="2425" />
-<TGConnectingPoint num="21" id="2426" />
-<TGConnectingPoint num="22" id="2427" />
-<TGConnectingPoint num="23" id="2428" />
-<TGConnectingPoint num="24" id="2429" />
-<TGConnectingPoint num="25" id="2430" />
-<TGConnectingPoint num="26" id="2431" />
-<TGConnectingPoint num="27" id="2432" />
-<TGConnectingPoint num="28" id="2433" />
-<TGConnectingPoint num="29" id="2434" />
-<TGConnectingPoint num="30" id="2435" />
-<TGConnectingPoint num="31" id="2436" />
-<TGConnectingPoint num="32" id="2437" />
-<TGConnectingPoint num="33" id="2438" />
-<TGConnectingPoint num="34" id="2439" />
-<TGConnectingPoint num="35" id="2440" />
-<TGConnectingPoint num="36" id="2441" />
-<TGConnectingPoint num="37" id="2442" />
-<TGConnectingPoint num="38" id="2443" />
-<TGConnectingPoint num="39" id="2444" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3347" />
+<TGConnectingPoint num="1" id="3348" />
+<TGConnectingPoint num="2" id="3349" />
+<TGConnectingPoint num="3" id="3350" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2486" >
-<cdparam x="580" y="990" />
-<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3360" >
+<cdparam x="983" y="1157" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="3359" />
+<P1  x="611" y="914" id="3560" />
+<P2  x="611" y="940" id="3514" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3358" >
+<father id="3360" num="0" />
+<cdparam x="629" y="930" />
+<sizeparam width="130" 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="1400" />
-<infoparam name="state0" value="MACDataOK" />
-<TGConnectingPoint num="0" id="2446" />
-<TGConnectingPoint num="1" id="2447" />
-<TGConnectingPoint num="2" id="2448" />
-<TGConnectingPoint num="3" id="2449" />
-<TGConnectingPoint num="4" id="2450" />
-<TGConnectingPoint num="5" id="2451" />
-<TGConnectingPoint num="6" id="2452" />
-<TGConnectingPoint num="7" id="2453" />
-<TGConnectingPoint num="8" id="2454" />
-<TGConnectingPoint num="9" id="2455" />
-<TGConnectingPoint num="10" id="2456" />
-<TGConnectingPoint num="11" id="2457" />
-<TGConnectingPoint num="12" id="2458" />
-<TGConnectingPoint num="13" id="2459" />
-<TGConnectingPoint num="14" id="2460" />
-<TGConnectingPoint num="15" id="2461" />
-<TGConnectingPoint num="16" id="2462" />
-<TGConnectingPoint num="17" id="2463" />
-<TGConnectingPoint num="18" id="2464" />
-<TGConnectingPoint num="19" id="2465" />
-<TGConnectingPoint num="20" id="2466" />
-<TGConnectingPoint num="21" id="2467" />
-<TGConnectingPoint num="22" id="2468" />
-<TGConnectingPoint num="23" id="2469" />
-<TGConnectingPoint num="24" id="2470" />
-<TGConnectingPoint num="25" id="2471" />
-<TGConnectingPoint num="26" id="2472" />
-<TGConnectingPoint num="27" id="2473" />
-<TGConnectingPoint num="28" id="2474" />
-<TGConnectingPoint num="29" id="2475" />
-<TGConnectingPoint num="30" id="2476" />
-<TGConnectingPoint num="31" id="2477" />
-<TGConnectingPoint num="32" id="2478" />
-<TGConnectingPoint num="33" id="2479" />
-<TGConnectingPoint num="34" id="2480" />
-<TGConnectingPoint num="35" id="2481" />
-<TGConnectingPoint num="36" id="2482" />
-<TGConnectingPoint num="37" id="2483" />
-<TGConnectingPoint num="38" id="2484" />
-<TGConnectingPoint num="39" id="2485" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3354" />
+<TGConnectingPoint num="1" id="3355" />
+<TGConnectingPoint num="2" id="3356" />
+<TGConnectingPoint num="3" id="3357" />
 <extraparam>
+<guard value="[msg1.data == ACK  ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2527" >
-<cdparam x="486" y="879" />
-<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="3367" >
+<cdparam x="732" y="1157" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="3366" />
+<P1  x="611" y="1098" id="3462" />
+<P2  x="610" y="1117" id="3473" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="3365" >
+<father id="3367" num="0" />
+<cdparam x="732" y="1197" />
+<sizeparam width="10" 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="1400" />
-<infoparam name="state0" value="testingMAC" />
-<TGConnectingPoint num="0" id="2487" />
-<TGConnectingPoint num="1" id="2488" />
-<TGConnectingPoint num="2" id="2489" />
-<TGConnectingPoint num="3" id="2490" />
-<TGConnectingPoint num="4" id="2491" />
-<TGConnectingPoint num="5" id="2492" />
-<TGConnectingPoint num="6" id="2493" />
-<TGConnectingPoint num="7" id="2494" />
-<TGConnectingPoint num="8" id="2495" />
-<TGConnectingPoint num="9" id="2496" />
-<TGConnectingPoint num="10" id="2497" />
-<TGConnectingPoint num="11" id="2498" />
-<TGConnectingPoint num="12" id="2499" />
-<TGConnectingPoint num="13" id="2500" />
-<TGConnectingPoint num="14" id="2501" />
-<TGConnectingPoint num="15" id="2502" />
-<TGConnectingPoint num="16" id="2503" />
-<TGConnectingPoint num="17" id="2504" />
-<TGConnectingPoint num="18" id="2505" />
-<TGConnectingPoint num="19" id="2506" />
-<TGConnectingPoint num="20" id="2507" />
-<TGConnectingPoint num="21" id="2508" />
-<TGConnectingPoint num="22" id="2509" />
-<TGConnectingPoint num="23" id="2510" />
-<TGConnectingPoint num="24" id="2511" />
-<TGConnectingPoint num="25" id="2512" />
-<TGConnectingPoint num="26" id="2513" />
-<TGConnectingPoint num="27" id="2514" />
-<TGConnectingPoint num="28" id="2515" />
-<TGConnectingPoint num="29" id="2516" />
-<TGConnectingPoint num="30" id="2517" />
-<TGConnectingPoint num="31" id="2518" />
-<TGConnectingPoint num="32" id="2519" />
-<TGConnectingPoint num="33" id="2520" />
-<TGConnectingPoint num="34" id="2521" />
-<TGConnectingPoint num="35" id="2522" />
-<TGConnectingPoint num="36" id="2523" />
-<TGConnectingPoint num="37" id="2524" />
-<TGConnectingPoint num="38" id="2525" />
-<TGConnectingPoint num="39" id="2526" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="3361" />
+<TGConnectingPoint num="1" id="3362" />
+<TGConnectingPoint num="2" id="3363" />
+<TGConnectingPoint num="3" id="3364" />
 <extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2568" >
-<cdparam x="353" y="322" />
-<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3408" >
+<cdparam x="429" y="709" />
+<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC0" />
-<TGConnectingPoint num="0" id="2528" />
-<TGConnectingPoint num="1" id="2529" />
-<TGConnectingPoint num="2" id="2530" />
-<TGConnectingPoint num="3" id="2531" />
-<TGConnectingPoint num="4" id="2532" />
-<TGConnectingPoint num="5" id="2533" />
-<TGConnectingPoint num="6" id="2534" />
-<TGConnectingPoint num="7" id="2535" />
-<TGConnectingPoint num="8" id="2536" />
-<TGConnectingPoint num="9" id="2537" />
-<TGConnectingPoint num="10" id="2538" />
-<TGConnectingPoint num="11" id="2539" />
-<TGConnectingPoint num="12" id="2540" />
-<TGConnectingPoint num="13" id="2541" />
-<TGConnectingPoint num="14" id="2542" />
-<TGConnectingPoint num="15" id="2543" />
-<TGConnectingPoint num="16" id="2544" />
-<TGConnectingPoint num="17" id="2545" />
-<TGConnectingPoint num="18" id="2546" />
-<TGConnectingPoint num="19" id="2547" />
-<TGConnectingPoint num="20" id="2548" />
-<TGConnectingPoint num="21" id="2549" />
-<TGConnectingPoint num="22" id="2550" />
-<TGConnectingPoint num="23" id="2551" />
-<TGConnectingPoint num="24" id="2552" />
-<TGConnectingPoint num="25" id="2553" />
-<TGConnectingPoint num="26" id="2554" />
-<TGConnectingPoint num="27" id="2555" />
-<TGConnectingPoint num="28" id="2556" />
-<TGConnectingPoint num="29" id="2557" />
-<TGConnectingPoint num="30" id="2558" />
-<TGConnectingPoint num="31" id="2559" />
-<TGConnectingPoint num="32" id="2560" />
-<TGConnectingPoint num="33" id="2561" />
-<TGConnectingPoint num="34" id="2562" />
-<TGConnectingPoint num="35" id="2563" />
-<TGConnectingPoint num="36" id="2564" />
-<TGConnectingPoint num="37" id="2565" />
-<TGConnectingPoint num="38" id="2566" />
-<TGConnectingPoint num="39" id="2567" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="state0" />
+<TGConnectingPoint num="0" id="3368" />
+<TGConnectingPoint num="1" id="3369" />
+<TGConnectingPoint num="2" id="3370" />
+<TGConnectingPoint num="3" id="3371" />
+<TGConnectingPoint num="4" id="3372" />
+<TGConnectingPoint num="5" id="3373" />
+<TGConnectingPoint num="6" id="3374" />
+<TGConnectingPoint num="7" id="3375" />
+<TGConnectingPoint num="8" id="3376" />
+<TGConnectingPoint num="9" id="3377" />
+<TGConnectingPoint num="10" id="3378" />
+<TGConnectingPoint num="11" id="3379" />
+<TGConnectingPoint num="12" id="3380" />
+<TGConnectingPoint num="13" id="3381" />
+<TGConnectingPoint num="14" id="3382" />
+<TGConnectingPoint num="15" id="3383" />
+<TGConnectingPoint num="16" id="3384" />
+<TGConnectingPoint num="17" id="3385" />
+<TGConnectingPoint num="18" id="3386" />
+<TGConnectingPoint num="19" id="3387" />
+<TGConnectingPoint num="20" id="3388" />
+<TGConnectingPoint num="21" id="3389" />
+<TGConnectingPoint num="22" id="3390" />
+<TGConnectingPoint num="23" id="3391" />
+<TGConnectingPoint num="24" id="3392" />
+<TGConnectingPoint num="25" id="3393" />
+<TGConnectingPoint num="26" id="3394" />
+<TGConnectingPoint num="27" id="3395" />
+<TGConnectingPoint num="28" id="3396" />
+<TGConnectingPoint num="29" id="3397" />
+<TGConnectingPoint num="30" id="3398" />
+<TGConnectingPoint num="31" id="3399" />
+<TGConnectingPoint num="32" id="3400" />
+<TGConnectingPoint num="33" id="3401" />
+<TGConnectingPoint num="34" id="3402" />
+<TGConnectingPoint num="35" id="3403" />
+<TGConnectingPoint num="36" id="3404" />
+<TGConnectingPoint num="37" id="3405" />
+<TGConnectingPoint num="38" id="3406" />
+<TGConnectingPoint num="39" id="3407" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2609" >
-<cdparam x="311" y="238" />
-<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3449" >
+<cdparam x="335" y="798" />
+<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="GotMessage" />
-<TGConnectingPoint num="0" id="2569" />
-<TGConnectingPoint num="1" id="2570" />
-<TGConnectingPoint num="2" id="2571" />
-<TGConnectingPoint num="3" id="2572" />
-<TGConnectingPoint num="4" id="2573" />
-<TGConnectingPoint num="5" id="2574" />
-<TGConnectingPoint num="6" id="2575" />
-<TGConnectingPoint num="7" id="2576" />
-<TGConnectingPoint num="8" id="2577" />
-<TGConnectingPoint num="9" id="2578" />
-<TGConnectingPoint num="10" id="2579" />
-<TGConnectingPoint num="11" id="2580" />
-<TGConnectingPoint num="12" id="2581" />
-<TGConnectingPoint num="13" id="2582" />
-<TGConnectingPoint num="14" id="2583" />
-<TGConnectingPoint num="15" id="2584" />
-<TGConnectingPoint num="16" id="2585" />
-<TGConnectingPoint num="17" id="2586" />
-<TGConnectingPoint num="18" id="2587" />
-<TGConnectingPoint num="19" id="2588" />
-<TGConnectingPoint num="20" id="2589" />
-<TGConnectingPoint num="21" id="2590" />
-<TGConnectingPoint num="22" id="2591" />
-<TGConnectingPoint num="23" id="2592" />
-<TGConnectingPoint num="24" id="2593" />
-<TGConnectingPoint num="25" id="2594" />
-<TGConnectingPoint num="26" id="2595" />
-<TGConnectingPoint num="27" id="2596" />
-<TGConnectingPoint num="28" id="2597" />
-<TGConnectingPoint num="29" id="2598" />
-<TGConnectingPoint num="30" id="2599" />
-<TGConnectingPoint num="31" id="2600" />
-<TGConnectingPoint num="32" id="2601" />
-<TGConnectingPoint num="33" id="2602" />
-<TGConnectingPoint num="34" id="2603" />
-<TGConnectingPoint num="35" id="2604" />
-<TGConnectingPoint num="36" id="2605" />
-<TGConnectingPoint num="37" id="2606" />
-<TGConnectingPoint num="38" id="2607" />
-<TGConnectingPoint num="39" id="2608" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="timerExpired" />
+<TGConnectingPoint num="0" id="3409" />
+<TGConnectingPoint num="1" id="3410" />
+<TGConnectingPoint num="2" id="3411" />
+<TGConnectingPoint num="3" id="3412" />
+<TGConnectingPoint num="4" id="3413" />
+<TGConnectingPoint num="5" id="3414" />
+<TGConnectingPoint num="6" id="3415" />
+<TGConnectingPoint num="7" id="3416" />
+<TGConnectingPoint num="8" id="3417" />
+<TGConnectingPoint num="9" id="3418" />
+<TGConnectingPoint num="10" id="3419" />
+<TGConnectingPoint num="11" id="3420" />
+<TGConnectingPoint num="12" id="3421" />
+<TGConnectingPoint num="13" id="3422" />
+<TGConnectingPoint num="14" id="3423" />
+<TGConnectingPoint num="15" id="3424" />
+<TGConnectingPoint num="16" id="3425" />
+<TGConnectingPoint num="17" id="3426" />
+<TGConnectingPoint num="18" id="3427" />
+<TGConnectingPoint num="19" id="3428" />
+<TGConnectingPoint num="20" id="3429" />
+<TGConnectingPoint num="21" id="3430" />
+<TGConnectingPoint num="22" id="3431" />
+<TGConnectingPoint num="23" id="3432" />
+<TGConnectingPoint num="24" id="3433" />
+<TGConnectingPoint num="25" id="3434" />
+<TGConnectingPoint num="26" id="3435" />
+<TGConnectingPoint num="27" id="3436" />
+<TGConnectingPoint num="28" id="3437" />
+<TGConnectingPoint num="29" id="3438" />
+<TGConnectingPoint num="30" id="3439" />
+<TGConnectingPoint num="31" id="3440" />
+<TGConnectingPoint num="32" id="3441" />
+<TGConnectingPoint num="33" id="3442" />
+<TGConnectingPoint num="34" id="3443" />
+<TGConnectingPoint num="35" id="3444" />
+<TGConnectingPoint num="36" id="3445" />
+<TGConnectingPoint num="37" id="3446" />
+<TGConnectingPoint num="38" id="3447" />
+<TGConnectingPoint num="39" id="3448" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2650" >
-<cdparam x="454" y="495" />
-<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3460" >
+<cdparam x="441" y="569" />
+<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="1400" />
-<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="2610" />
-<TGConnectingPoint num="1" id="2611" />
-<TGConnectingPoint num="2" id="2612" />
-<TGConnectingPoint num="3" id="2613" />
-<TGConnectingPoint num="4" id="2614" />
-<TGConnectingPoint num="5" id="2615" />
-<TGConnectingPoint num="6" id="2616" />
-<TGConnectingPoint num="7" id="2617" />
-<TGConnectingPoint num="8" id="2618" />
-<TGConnectingPoint num="9" id="2619" />
-<TGConnectingPoint num="10" id="2620" />
-<TGConnectingPoint num="11" id="2621" />
-<TGConnectingPoint num="12" id="2622" />
-<TGConnectingPoint num="13" id="2623" />
-<TGConnectingPoint num="14" id="2624" />
-<TGConnectingPoint num="15" id="2625" />
-<TGConnectingPoint num="16" id="2626" />
-<TGConnectingPoint num="17" id="2627" />
-<TGConnectingPoint num="18" id="2628" />
-<TGConnectingPoint num="19" id="2629" />
-<TGConnectingPoint num="20" id="2630" />
-<TGConnectingPoint num="21" id="2631" />
-<TGConnectingPoint num="22" id="2632" />
-<TGConnectingPoint num="23" id="2633" />
-<TGConnectingPoint num="24" id="2634" />
-<TGConnectingPoint num="25" id="2635" />
-<TGConnectingPoint num="26" id="2636" />
-<TGConnectingPoint num="27" id="2637" />
-<TGConnectingPoint num="28" id="2638" />
-<TGConnectingPoint num="29" id="2639" />
-<TGConnectingPoint num="30" id="2640" />
-<TGConnectingPoint num="31" id="2641" />
-<TGConnectingPoint num="32" id="2642" />
-<TGConnectingPoint num="33" id="2643" />
-<TGConnectingPoint num="34" id="2644" />
-<TGConnectingPoint num="35" id="2645" />
-<TGConnectingPoint num="36" id="2646" />
-<TGConnectingPoint num="37" id="2647" />
-<TGConnectingPoint num="38" id="2648" />
-<TGConnectingPoint num="39" id="2649" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(settimer)" />
+<TGConnectingPoint num="0" id="3450" />
+<TGConnectingPoint num="1" id="3451" />
+<TGConnectingPoint num="2" id="3452" />
+<TGConnectingPoint num="3" id="3453" />
+<TGConnectingPoint num="4" id="3454" />
+<TGConnectingPoint num="5" id="3455" />
+<TGConnectingPoint num="6" id="3456" />
+<TGConnectingPoint num="7" id="3457" />
+<TGConnectingPoint num="8" id="3458" />
+<TGConnectingPoint num="9" id="3459" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2691" >
-<cdparam x="259" y="100" />
-<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3471" >
+<cdparam x="575" y="1073" />
+<sizeparam width="73" 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="1400" />
-<infoparam name="state0" value="waitForKeyGroup" />
-<TGConnectingPoint num="0" id="2651" />
-<TGConnectingPoint num="1" id="2652" />
-<TGConnectingPoint num="2" id="2653" />
-<TGConnectingPoint num="3" id="2654" />
-<TGConnectingPoint num="4" id="2655" />
-<TGConnectingPoint num="5" id="2656" />
-<TGConnectingPoint num="6" id="2657" />
-<TGConnectingPoint num="7" id="2658" />
-<TGConnectingPoint num="8" id="2659" />
-<TGConnectingPoint num="9" id="2660" />
-<TGConnectingPoint num="10" id="2661" />
-<TGConnectingPoint num="11" id="2662" />
-<TGConnectingPoint num="12" id="2663" />
-<TGConnectingPoint num="13" id="2664" />
-<TGConnectingPoint num="14" id="2665" />
-<TGConnectingPoint num="15" id="2666" />
-<TGConnectingPoint num="16" id="2667" />
-<TGConnectingPoint num="17" id="2668" />
-<TGConnectingPoint num="18" id="2669" />
-<TGConnectingPoint num="19" id="2670" />
-<TGConnectingPoint num="20" id="2671" />
-<TGConnectingPoint num="21" id="2672" />
-<TGConnectingPoint num="22" id="2673" />
-<TGConnectingPoint num="23" id="2674" />
-<TGConnectingPoint num="24" id="2675" />
-<TGConnectingPoint num="25" id="2676" />
-<TGConnectingPoint num="26" id="2677" />
-<TGConnectingPoint num="27" id="2678" />
-<TGConnectingPoint num="28" id="2679" />
-<TGConnectingPoint num="29" id="2680" />
-<TGConnectingPoint num="30" id="2681" />
-<TGConnectingPoint num="31" id="2682" />
-<TGConnectingPoint num="32" id="2683" />
-<TGConnectingPoint num="33" id="2684" />
-<TGConnectingPoint num="34" id="2685" />
-<TGConnectingPoint num="35" id="2686" />
-<TGConnectingPoint num="36" id="2687" />
-<TGConnectingPoint num="37" id="2688" />
-<TGConnectingPoint num="38" id="2689" />
-<TGConnectingPoint num="39" id="2690" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="3461" />
+<TGConnectingPoint num="1" id="3462" />
+<TGConnectingPoint num="2" id="3463" />
+<TGConnectingPoint num="3" id="3464" />
+<TGConnectingPoint num="4" id="3465" />
+<TGConnectingPoint num="5" id="3466" />
+<TGConnectingPoint num="6" id="3467" />
+<TGConnectingPoint num="7" id="3468" />
+<TGConnectingPoint num="8" id="3469" />
+<TGConnectingPoint num="9" id="3470" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="3512" >
+<cdparam x="513" y="1117" />
+<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_FORWARDED" />
+<TGConnectingPoint num="0" id="3472" />
+<TGConnectingPoint num="1" id="3473" />
+<TGConnectingPoint num="2" id="3474" />
+<TGConnectingPoint num="3" id="3475" />
+<TGConnectingPoint num="4" id="3476" />
+<TGConnectingPoint num="5" id="3477" />
+<TGConnectingPoint num="6" id="3478" />
+<TGConnectingPoint num="7" id="3479" />
+<TGConnectingPoint num="8" id="3480" />
+<TGConnectingPoint num="9" id="3481" />
+<TGConnectingPoint num="10" id="3482" />
+<TGConnectingPoint num="11" id="3483" />
+<TGConnectingPoint num="12" id="3484" />
+<TGConnectingPoint num="13" id="3485" />
+<TGConnectingPoint num="14" id="3486" />
+<TGConnectingPoint num="15" id="3487" />
+<TGConnectingPoint num="16" id="3488" />
+<TGConnectingPoint num="17" id="3489" />
+<TGConnectingPoint num="18" id="3490" />
+<TGConnectingPoint num="19" id="3491" />
+<TGConnectingPoint num="20" id="3492" />
+<TGConnectingPoint num="21" id="3493" />
+<TGConnectingPoint num="22" id="3494" />
+<TGConnectingPoint num="23" id="3495" />
+<TGConnectingPoint num="24" id="3496" />
+<TGConnectingPoint num="25" id="3497" />
+<TGConnectingPoint num="26" id="3498" />
+<TGConnectingPoint num="27" id="3499" />
+<TGConnectingPoint num="28" id="3500" />
+<TGConnectingPoint num="29" id="3501" />
+<TGConnectingPoint num="30" id="3502" />
+<TGConnectingPoint num="31" id="3503" />
+<TGConnectingPoint num="32" id="3504" />
+<TGConnectingPoint num="33" id="3505" />
+<TGConnectingPoint num="34" id="3506" />
+<TGConnectingPoint num="35" id="3507" />
+<TGConnectingPoint num="36" id="3508" />
+<TGConnectingPoint num="37" id="3509" />
+<TGConnectingPoint num="38" id="3510" />
+<TGConnectingPoint num="39" id="3511" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="2693" >
-<cdparam x="335" y="52" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3553" >
+<cdparam x="539" y="940" />
+<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2692" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="ACK_OK" />
+<TGConnectingPoint num="0" id="3513" />
+<TGConnectingPoint num="1" id="3514" />
+<TGConnectingPoint num="2" id="3515" />
+<TGConnectingPoint num="3" id="3516" />
+<TGConnectingPoint num="4" id="3517" />
+<TGConnectingPoint num="5" id="3518" />
+<TGConnectingPoint num="6" id="3519" />
+<TGConnectingPoint num="7" id="3520" />
+<TGConnectingPoint num="8" id="3521" />
+<TGConnectingPoint num="9" id="3522" />
+<TGConnectingPoint num="10" id="3523" />
+<TGConnectingPoint num="11" id="3524" />
+<TGConnectingPoint num="12" id="3525" />
+<TGConnectingPoint num="13" id="3526" />
+<TGConnectingPoint num="14" id="3527" />
+<TGConnectingPoint num="15" id="3528" />
+<TGConnectingPoint num="16" id="3529" />
+<TGConnectingPoint num="17" id="3530" />
+<TGConnectingPoint num="18" id="3531" />
+<TGConnectingPoint num="19" id="3532" />
+<TGConnectingPoint num="20" id="3533" />
+<TGConnectingPoint num="21" id="3534" />
+<TGConnectingPoint num="22" id="3535" />
+<TGConnectingPoint num="23" id="3536" />
+<TGConnectingPoint num="24" id="3537" />
+<TGConnectingPoint num="25" id="3538" />
+<TGConnectingPoint num="26" id="3539" />
+<TGConnectingPoint num="27" id="3540" />
+<TGConnectingPoint num="28" id="3541" />
+<TGConnectingPoint num="29" id="3542" />
+<TGConnectingPoint num="30" id="3543" />
+<TGConnectingPoint num="31" id="3544" />
+<TGConnectingPoint num="32" id="3545" />
+<TGConnectingPoint num="33" id="3546" />
+<TGConnectingPoint num="34" id="3547" />
+<TGConnectingPoint num="35" id="3548" />
+<TGConnectingPoint num="36" id="3549" />
+<TGConnectingPoint num="37" id="3550" />
+<TGConnectingPoint num="38" id="3551" />
+<TGConnectingPoint num="39" id="3552" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="2704" >
-<cdparam x="314" y="178" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3594" >
+<cdparam x="552" y="874" />
+<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="2694" />
-<TGConnectingPoint num="1" id="2695" />
-<TGConnectingPoint num="2" id="2696" />
-<TGConnectingPoint num="3" id="2697" />
-<TGConnectingPoint num="4" id="2698" />
-<TGConnectingPoint num="5" id="2699" />
-<TGConnectingPoint num="6" id="2700" />
-<TGConnectingPoint num="7" id="2701" />
-<TGConnectingPoint num="8" id="2702" />
-<TGConnectingPoint num="9" id="2703" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACK" />
+<TGConnectingPoint num="0" id="3554" />
+<TGConnectingPoint num="1" id="3555" />
+<TGConnectingPoint num="2" id="3556" />
+<TGConnectingPoint num="3" id="3557" />
+<TGConnectingPoint num="4" id="3558" />
+<TGConnectingPoint num="5" id="3559" />
+<TGConnectingPoint num="6" id="3560" />
+<TGConnectingPoint num="7" id="3561" />
+<TGConnectingPoint num="8" id="3562" />
+<TGConnectingPoint num="9" id="3563" />
+<TGConnectingPoint num="10" id="3564" />
+<TGConnectingPoint num="11" id="3565" />
+<TGConnectingPoint num="12" id="3566" />
+<TGConnectingPoint num="13" id="3567" />
+<TGConnectingPoint num="14" id="3568" />
+<TGConnectingPoint num="15" id="3569" />
+<TGConnectingPoint num="16" id="3570" />
+<TGConnectingPoint num="17" id="3571" />
+<TGConnectingPoint num="18" id="3572" />
+<TGConnectingPoint num="19" id="3573" />
+<TGConnectingPoint num="20" id="3574" />
+<TGConnectingPoint num="21" id="3575" />
+<TGConnectingPoint num="22" id="3576" />
+<TGConnectingPoint num="23" id="3577" />
+<TGConnectingPoint num="24" id="3578" />
+<TGConnectingPoint num="25" id="3579" />
+<TGConnectingPoint num="26" id="3580" />
+<TGConnectingPoint num="27" id="3581" />
+<TGConnectingPoint num="28" id="3582" />
+<TGConnectingPoint num="29" id="3583" />
+<TGConnectingPoint num="30" id="3584" />
+<TGConnectingPoint num="31" id="3585" />
+<TGConnectingPoint num="32" id="3586" />
+<TGConnectingPoint num="33" id="3587" />
+<TGConnectingPoint num="34" id="3588" />
+<TGConnectingPoint num="35" id="3589" />
+<TGConnectingPoint num="36" id="3590" />
+<TGConnectingPoint num="37" id="3591" />
+<TGConnectingPoint num="38" id="3592" />
+<TGConnectingPoint num="39" id="3593" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="2715" >
-<cdparam x="512" y="767" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3635" >
+<cdparam x="532" y="797" />
+<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="2705" />
-<TGConnectingPoint num="1" id="2706" />
-<TGConnectingPoint num="2" id="2707" />
-<TGConnectingPoint num="3" id="2708" />
-<TGConnectingPoint num="4" id="2709" />
-<TGConnectingPoint num="5" id="2710" />
-<TGConnectingPoint num="6" id="2711" />
-<TGConnectingPoint num="7" id="2712" />
-<TGConnectingPoint num="8" id="2713" />
-<TGConnectingPoint num="9" id="2714" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="2756" >
-<cdparam x="451" y="688" />
-<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="WaitForData" />
-<TGConnectingPoint num="0" id="2716" />
-<TGConnectingPoint num="1" id="2717" />
-<TGConnectingPoint num="2" id="2718" />
-<TGConnectingPoint num="3" id="2719" />
-<TGConnectingPoint num="4" id="2720" />
-<TGConnectingPoint num="5" id="2721" />
-<TGConnectingPoint num="6" id="2722" />
-<TGConnectingPoint num="7" id="2723" />
-<TGConnectingPoint num="8" id="2724" />
-<TGConnectingPoint num="9" id="2725" />
-<TGConnectingPoint num="10" id="2726" />
-<TGConnectingPoint num="11" id="2727" />
-<TGConnectingPoint num="12" id="2728" />
-<TGConnectingPoint num="13" id="2729" />
-<TGConnectingPoint num="14" id="2730" />
-<TGConnectingPoint num="15" id="2731" />
-<TGConnectingPoint num="16" id="2732" />
-<TGConnectingPoint num="17" id="2733" />
-<TGConnectingPoint num="18" id="2734" />
-<TGConnectingPoint num="19" id="2735" />
-<TGConnectingPoint num="20" id="2736" />
-<TGConnectingPoint num="21" id="2737" />
-<TGConnectingPoint num="22" id="2738" />
-<TGConnectingPoint num="23" id="2739" />
-<TGConnectingPoint num="24" id="2740" />
-<TGConnectingPoint num="25" id="2741" />
-<TGConnectingPoint num="26" id="2742" />
-<TGConnectingPoint num="27" id="2743" />
-<TGConnectingPoint num="28" id="2744" />
-<TGConnectingPoint num="29" id="2745" />
-<TGConnectingPoint num="30" id="2746" />
-<TGConnectingPoint num="31" id="2747" />
-<TGConnectingPoint num="32" id="2748" />
-<TGConnectingPoint num="33" id="2749" />
-<TGConnectingPoint num="34" id="2750" />
-<TGConnectingPoint num="35" id="2751" />
-<TGConnectingPoint num="36" id="2752" />
-<TGConnectingPoint num="37" id="2753" />
-<TGConnectingPoint num="38" id="2754" />
-<TGConnectingPoint num="39" id="2755" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="CheckACKMAC" />
+<TGConnectingPoint num="0" id="3595" />
+<TGConnectingPoint num="1" id="3596" />
+<TGConnectingPoint num="2" id="3597" />
+<TGConnectingPoint num="3" id="3598" />
+<TGConnectingPoint num="4" id="3599" />
+<TGConnectingPoint num="5" id="3600" />
+<TGConnectingPoint num="6" id="3601" />
+<TGConnectingPoint num="7" id="3602" />
+<TGConnectingPoint num="8" id="3603" />
+<TGConnectingPoint num="9" id="3604" />
+<TGConnectingPoint num="10" id="3605" />
+<TGConnectingPoint num="11" id="3606" />
+<TGConnectingPoint num="12" id="3607" />
+<TGConnectingPoint num="13" id="3608" />
+<TGConnectingPoint num="14" id="3609" />
+<TGConnectingPoint num="15" id="3610" />
+<TGConnectingPoint num="16" id="3611" />
+<TGConnectingPoint num="17" id="3612" />
+<TGConnectingPoint num="18" id="3613" />
+<TGConnectingPoint num="19" id="3614" />
+<TGConnectingPoint num="20" id="3615" />
+<TGConnectingPoint num="21" id="3616" />
+<TGConnectingPoint num="22" id="3617" />
+<TGConnectingPoint num="23" id="3618" />
+<TGConnectingPoint num="24" id="3619" />
+<TGConnectingPoint num="25" id="3620" />
+<TGConnectingPoint num="26" id="3621" />
+<TGConnectingPoint num="27" id="3622" />
+<TGConnectingPoint num="28" id="3623" />
+<TGConnectingPoint num="29" id="3624" />
+<TGConnectingPoint num="30" id="3625" />
+<TGConnectingPoint num="31" id="3626" />
+<TGConnectingPoint num="32" id="3627" />
+<TGConnectingPoint num="33" id="3628" />
+<TGConnectingPoint num="34" id="3629" />
+<TGConnectingPoint num="35" id="3630" />
+<TGConnectingPoint num="36" id="3631" />
+<TGConnectingPoint num="37" id="3632" />
+<TGConnectingPoint num="38" id="3633" />
+<TGConnectingPoint num="39" id="3634" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2767" >
-<cdparam x="507" y="628" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3676" >
+<cdparam x="394" y="336" />
+<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="2757" />
-<TGConnectingPoint num="1" id="2758" />
-<TGConnectingPoint num="2" id="2759" />
-<TGConnectingPoint num="3" id="2760" />
-<TGConnectingPoint num="4" id="2761" />
-<TGConnectingPoint num="5" id="2762" />
-<TGConnectingPoint num="6" id="2763" />
-<TGConnectingPoint num="7" id="2764" />
-<TGConnectingPoint num="8" id="2765" />
-<TGConnectingPoint num="9" id="2766" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC_OK" />
+<TGConnectingPoint num="0" id="3636" />
+<TGConnectingPoint num="1" id="3637" />
+<TGConnectingPoint num="2" id="3638" />
+<TGConnectingPoint num="3" id="3639" />
+<TGConnectingPoint num="4" id="3640" />
+<TGConnectingPoint num="5" id="3641" />
+<TGConnectingPoint num="6" id="3642" />
+<TGConnectingPoint num="7" id="3643" />
+<TGConnectingPoint num="8" id="3644" />
+<TGConnectingPoint num="9" id="3645" />
+<TGConnectingPoint num="10" id="3646" />
+<TGConnectingPoint num="11" id="3647" />
+<TGConnectingPoint num="12" id="3648" />
+<TGConnectingPoint num="13" id="3649" />
+<TGConnectingPoint num="14" id="3650" />
+<TGConnectingPoint num="15" id="3651" />
+<TGConnectingPoint num="16" id="3652" />
+<TGConnectingPoint num="17" id="3653" />
+<TGConnectingPoint num="18" id="3654" />
+<TGConnectingPoint num="19" id="3655" />
+<TGConnectingPoint num="20" id="3656" />
+<TGConnectingPoint num="21" id="3657" />
+<TGConnectingPoint num="22" id="3658" />
+<TGConnectingPoint num="23" id="3659" />
+<TGConnectingPoint num="24" id="3660" />
+<TGConnectingPoint num="25" id="3661" />
+<TGConnectingPoint num="26" id="3662" />
+<TGConnectingPoint num="27" id="3663" />
+<TGConnectingPoint num="28" id="3664" />
+<TGConnectingPoint num="29" id="3665" />
+<TGConnectingPoint num="30" id="3666" />
+<TGConnectingPoint num="31" id="3667" />
+<TGConnectingPoint num="32" id="3668" />
+<TGConnectingPoint num="33" id="3669" />
+<TGConnectingPoint num="34" id="3670" />
+<TGConnectingPoint num="35" id="3671" />
+<TGConnectingPoint num="36" id="3672" />
+<TGConnectingPoint num="37" id="3673" />
+<TGConnectingPoint num="38" id="3674" />
+<TGConnectingPoint num="39" id="3675" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="2808" >
-<cdparam x="405" y="405" />
-<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3717" >
+<cdparam x="411" y="426" />
+<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="2768" />
-<TGConnectingPoint num="1" id="2769" />
-<TGConnectingPoint num="2" id="2770" />
-<TGConnectingPoint num="3" id="2771" />
-<TGConnectingPoint num="4" id="2772" />
-<TGConnectingPoint num="5" id="2773" />
-<TGConnectingPoint num="6" id="2774" />
-<TGConnectingPoint num="7" id="2775" />
-<TGConnectingPoint num="8" id="2776" />
-<TGConnectingPoint num="9" id="2777" />
-<TGConnectingPoint num="10" id="2778" />
-<TGConnectingPoint num="11" id="2779" />
-<TGConnectingPoint num="12" id="2780" />
-<TGConnectingPoint num="13" id="2781" />
-<TGConnectingPoint num="14" id="2782" />
-<TGConnectingPoint num="15" id="2783" />
-<TGConnectingPoint num="16" id="2784" />
-<TGConnectingPoint num="17" id="2785" />
-<TGConnectingPoint num="18" id="2786" />
-<TGConnectingPoint num="19" id="2787" />
-<TGConnectingPoint num="20" id="2788" />
-<TGConnectingPoint num="21" id="2789" />
-<TGConnectingPoint num="22" id="2790" />
-<TGConnectingPoint num="23" id="2791" />
-<TGConnectingPoint num="24" id="2792" />
-<TGConnectingPoint num="25" id="2793" />
-<TGConnectingPoint num="26" id="2794" />
-<TGConnectingPoint num="27" id="2795" />
-<TGConnectingPoint num="28" id="2796" />
-<TGConnectingPoint num="29" id="2797" />
-<TGConnectingPoint num="30" id="2798" />
-<TGConnectingPoint num="31" id="2799" />
-<TGConnectingPoint num="32" id="2800" />
-<TGConnectingPoint num="33" id="2801" />
-<TGConnectingPoint num="34" id="2802" />
-<TGConnectingPoint num="35" id="2803" />
-<TGConnectingPoint num="36" id="2804" />
-<TGConnectingPoint num="37" id="2805" />
-<TGConnectingPoint num="38" id="2806" />
-<TGConnectingPoint num="39" id="2807" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="decipherOK" />
+<TGConnectingPoint num="0" id="3677" />
+<TGConnectingPoint num="1" id="3678" />
+<TGConnectingPoint num="2" id="3679" />
+<TGConnectingPoint num="3" id="3680" />
+<TGConnectingPoint num="4" id="3681" />
+<TGConnectingPoint num="5" id="3682" />
+<TGConnectingPoint num="6" id="3683" />
+<TGConnectingPoint num="7" id="3684" />
+<TGConnectingPoint num="8" id="3685" />
+<TGConnectingPoint num="9" id="3686" />
+<TGConnectingPoint num="10" id="3687" />
+<TGConnectingPoint num="11" id="3688" />
+<TGConnectingPoint num="12" id="3689" />
+<TGConnectingPoint num="13" id="3690" />
+<TGConnectingPoint num="14" id="3691" />
+<TGConnectingPoint num="15" id="3692" />
+<TGConnectingPoint num="16" id="3693" />
+<TGConnectingPoint num="17" id="3694" />
+<TGConnectingPoint num="18" id="3695" />
+<TGConnectingPoint num="19" id="3696" />
+<TGConnectingPoint num="20" id="3697" />
+<TGConnectingPoint num="21" id="3698" />
+<TGConnectingPoint num="22" id="3699" />
+<TGConnectingPoint num="23" id="3700" />
+<TGConnectingPoint num="24" id="3701" />
+<TGConnectingPoint num="25" id="3702" />
+<TGConnectingPoint num="26" id="3703" />
+<TGConnectingPoint num="27" id="3704" />
+<TGConnectingPoint num="28" id="3705" />
+<TGConnectingPoint num="29" id="3706" />
+<TGConnectingPoint num="30" id="3707" />
+<TGConnectingPoint num="31" id="3708" />
+<TGConnectingPoint num="32" id="3709" />
+<TGConnectingPoint num="33" id="3710" />
+<TGConnectingPoint num="34" id="3711" />
+<TGConnectingPoint num="35" id="3712" />
+<TGConnectingPoint num="36" id="3713" />
+<TGConnectingPoint num="37" id="3714" />
+<TGConnectingPoint num="38" id="3715" />
+<TGConnectingPoint num="39" id="3716" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="1400" >
-<CONNECTOR type="5102" id="2815" >
-<cdparam x="225" y="74" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="2814" />
-<P1  x="173" y="59" id="3247" />
-<P2  x="177" y="90" id="2887" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2813" >
-<father id="2815" num="0" />
-<cdparam x="213" y="72" />
-<sizeparam width="136" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3758" >
+<cdparam x="314" y="177" />
+<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2809" />
-<TGConnectingPoint num="1" id="2810" />
-<TGConnectingPoint num="2" id="2811" />
-<TGConnectingPoint num="3" id="2812" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="gotFirstMessage" />
+<TGConnectingPoint num="0" id="3718" />
+<TGConnectingPoint num="1" id="3719" />
+<TGConnectingPoint num="2" id="3720" />
+<TGConnectingPoint num="3" id="3721" />
+<TGConnectingPoint num="4" id="3722" />
+<TGConnectingPoint num="5" id="3723" />
+<TGConnectingPoint num="6" id="3724" />
+<TGConnectingPoint num="7" id="3725" />
+<TGConnectingPoint num="8" id="3726" />
+<TGConnectingPoint num="9" id="3727" />
+<TGConnectingPoint num="10" id="3728" />
+<TGConnectingPoint num="11" id="3729" />
+<TGConnectingPoint num="12" id="3730" />
+<TGConnectingPoint num="13" id="3731" />
+<TGConnectingPoint num="14" id="3732" />
+<TGConnectingPoint num="15" id="3733" />
+<TGConnectingPoint num="16" id="3734" />
+<TGConnectingPoint num="17" id="3735" />
+<TGConnectingPoint num="18" id="3736" />
+<TGConnectingPoint num="19" id="3737" />
+<TGConnectingPoint num="20" id="3738" />
+<TGConnectingPoint num="21" id="3739" />
+<TGConnectingPoint num="22" id="3740" />
+<TGConnectingPoint num="23" id="3741" />
+<TGConnectingPoint num="24" id="3742" />
+<TGConnectingPoint num="25" id="3743" />
+<TGConnectingPoint num="26" id="3744" />
+<TGConnectingPoint num="27" id="3745" />
+<TGConnectingPoint num="28" id="3746" />
+<TGConnectingPoint num="29" id="3747" />
+<TGConnectingPoint num="30" id="3748" />
+<TGConnectingPoint num="31" id="3749" />
+<TGConnectingPoint num="32" id="3750" />
+<TGConnectingPoint num="33" id="3751" />
+<TGConnectingPoint num="34" id="3752" />
+<TGConnectingPoint num="35" id="3753" />
+<TGConnectingPoint num="36" id="3754" />
+<TGConnectingPoint num="37" id="3755" />
+<TGConnectingPoint num="38" id="3756" />
+<TGConnectingPoint num="39" id="3757" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="msga.data = SesK.data" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2822" >
-<cdparam x="192" y="159" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2821" />
-<P1  x="211" y="152" id="2901" />
-<P2  x="228" y="212" id="3236" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2820" >
-<father id="2822" num="0" />
-<cdparam x="274" y="126" />
-<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="3769" >
+<cdparam x="452" y="664" />
+<sizeparam width="73" 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="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2816" />
-<TGConnectingPoint num="1" id="2817" />
-<TGConnectingPoint num="2" id="2818" />
-<TGConnectingPoint num="3" id="2819" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="msg1 = sencrypt(msga, PSK1)" />
-<actions value="msg2.data = groupid" />
-<actions value="msg3.data = timestamp" />
-<actions value="msg4 = concat3(msg1, msg2, msg3)" />
-<actions value="msg5 = MAC(msg4, PSK1)" />
-<actions value="msg6=concat2(msg4, msg5)" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="3759" />
+<TGConnectingPoint num="1" id="3760" />
+<TGConnectingPoint num="2" id="3761" />
+<TGConnectingPoint num="3" id="3762" />
+<TGConnectingPoint num="4" id="3763" />
+<TGConnectingPoint num="5" id="3764" />
+<TGConnectingPoint num="6" id="3765" />
+<TGConnectingPoint num="7" id="3766" />
+<TGConnectingPoint num="8" id="3767" />
+<TGConnectingPoint num="9" id="3768" />
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2829" >
-<cdparam x="512" y="848" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2828" />
-<P1  x="530" y="917" id="2928" />
-<P2  x="530" y="985" id="2980" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2827" >
-<father id="2829" num="0" />
-<cdparam x="512" y="888" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3810" >
+<cdparam x="391" y="613" />
+<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2823" />
-<TGConnectingPoint num="1" id="2824" />
-<TGConnectingPoint num="2" id="2825" />
-<TGConnectingPoint num="3" id="2826" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="WaitForACK" />
+<TGConnectingPoint num="0" id="3770" />
+<TGConnectingPoint num="1" id="3771" />
+<TGConnectingPoint num="2" id="3772" />
+<TGConnectingPoint num="3" id="3773" />
+<TGConnectingPoint num="4" id="3774" />
+<TGConnectingPoint num="5" id="3775" />
+<TGConnectingPoint num="6" id="3776" />
+<TGConnectingPoint num="7" id="3777" />
+<TGConnectingPoint num="8" id="3778" />
+<TGConnectingPoint num="9" id="3779" />
+<TGConnectingPoint num="10" id="3780" />
+<TGConnectingPoint num="11" id="3781" />
+<TGConnectingPoint num="12" id="3782" />
+<TGConnectingPoint num="13" id="3783" />
+<TGConnectingPoint num="14" id="3784" />
+<TGConnectingPoint num="15" id="3785" />
+<TGConnectingPoint num="16" id="3786" />
+<TGConnectingPoint num="17" id="3787" />
+<TGConnectingPoint num="18" id="3788" />
+<TGConnectingPoint num="19" id="3789" />
+<TGConnectingPoint num="20" id="3790" />
+<TGConnectingPoint num="21" id="3791" />
+<TGConnectingPoint num="22" id="3792" />
+<TGConnectingPoint num="23" id="3793" />
+<TGConnectingPoint num="24" id="3794" />
+<TGConnectingPoint num="25" id="3795" />
+<TGConnectingPoint num="26" id="3796" />
+<TGConnectingPoint num="27" id="3797" />
+<TGConnectingPoint num="28" id="3798" />
+<TGConnectingPoint num="29" id="3799" />
+<TGConnectingPoint num="30" id="3800" />
+<TGConnectingPoint num="31" id="3801" />
+<TGConnectingPoint num="32" id="3802" />
+<TGConnectingPoint num="33" id="3803" />
+<TGConnectingPoint num="34" id="3804" />
+<TGConnectingPoint num="35" id="3805" />
+<TGConnectingPoint num="36" id="3806" />
+<TGConnectingPoint num="37" id="3807" />
+<TGConnectingPoint num="38" id="3808" />
+<TGConnectingPoint num="39" id="3809" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2836" >
-<cdparam x="512" y="778" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2835" />
-<P1  x="523" y="778" id="3026" />
-<P2  x="530" y="887" id="2927" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2834" >
-<father id="2836" num="0" />
-<cdparam x="512" y="818" />
-<sizeparam width="174" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="3821" >
+<cdparam x="453" y="538" />
+<sizeparam width="73" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2830" />
-<TGConnectingPoint num="1" id="2831" />
-<TGConnectingPoint num="2" id="2832" />
-<TGConnectingPoint num="3" id="2833" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="msg4.data = confData" />
-<actions value="msg1 = sencrypt(msg4, SesK)" />
-<actions value="msg2 = MAC(msg1, SesK)" />
-<actions value="msg = concat2(msg1, msg2)" />
-</extraparam>
-</SUBCOMPONENT>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="3811" />
+<TGConnectingPoint num="1" id="3812" />
+<TGConnectingPoint num="2" id="3813" />
+<TGConnectingPoint num="3" id="3814" />
+<TGConnectingPoint num="4" id="3815" />
+<TGConnectingPoint num="5" id="3816" />
+<TGConnectingPoint num="6" id="3817" />
+<TGConnectingPoint num="7" id="3818" />
+<TGConnectingPoint num="8" id="3819" />
+<TGConnectingPoint num="9" id="3820" />
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2843" >
-<cdparam x="363" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2842" />
-<P1  x="363" y="654" id="3116" />
-<P2  x="238" y="734" id="2939" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2841" >
-<father id="2843" num="0" />
-<cdparam x="254" y="699" />
-<sizeparam width="152" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3862" >
+<cdparam x="250" y="334" />
+<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2837" />
-<TGConnectingPoint num="1" id="2838" />
-<TGConnectingPoint num="2" id="2839" />
-<TGConnectingPoint num="3" id="2840" />
-<extraparam>
-<guard value="[not(msg1.data == ACK) ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="TestMACFailed" />
+<TGConnectingPoint num="0" id="3822" />
+<TGConnectingPoint num="1" id="3823" />
+<TGConnectingPoint num="2" id="3824" />
+<TGConnectingPoint num="3" id="3825" />
+<TGConnectingPoint num="4" id="3826" />
+<TGConnectingPoint num="5" id="3827" />
+<TGConnectingPoint num="6" id="3828" />
+<TGConnectingPoint num="7" id="3829" />
+<TGConnectingPoint num="8" id="3830" />
+<TGConnectingPoint num="9" id="3831" />
+<TGConnectingPoint num="10" id="3832" />
+<TGConnectingPoint num="11" id="3833" />
+<TGConnectingPoint num="12" id="3834" />
+<TGConnectingPoint num="13" id="3835" />
+<TGConnectingPoint num="14" id="3836" />
+<TGConnectingPoint num="15" id="3837" />
+<TGConnectingPoint num="16" id="3838" />
+<TGConnectingPoint num="17" id="3839" />
+<TGConnectingPoint num="18" id="3840" />
+<TGConnectingPoint num="19" id="3841" />
+<TGConnectingPoint num="20" id="3842" />
+<TGConnectingPoint num="21" id="3843" />
+<TGConnectingPoint num="22" id="3844" />
+<TGConnectingPoint num="23" id="3845" />
+<TGConnectingPoint num="24" id="3846" />
+<TGConnectingPoint num="25" id="3847" />
+<TGConnectingPoint num="26" id="3848" />
+<TGConnectingPoint num="27" id="3849" />
+<TGConnectingPoint num="28" id="3850" />
+<TGConnectingPoint num="29" id="3851" />
+<TGConnectingPoint num="30" id="3852" />
+<TGConnectingPoint num="31" id="3853" />
+<TGConnectingPoint num="32" id="3854" />
+<TGConnectingPoint num="33" id="3855" />
+<TGConnectingPoint num="34" id="3856" />
+<TGConnectingPoint num="35" id="3857" />
+<TGConnectingPoint num="36" id="3858" />
+<TGConnectingPoint num="37" id="3859" />
+<TGConnectingPoint num="38" id="3860" />
+<TGConnectingPoint num="39" id="3861" />
+<extraparam>
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2850" >
-<cdparam x="436" y="654" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2849" />
-<P1  x="436" y="654" id="3117" />
-<P2  x="523" y="738" id="3021" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2848" >
-<father id="2850" num="0" />
-<cdparam x="446" y="694" />
-<sizeparam width="126" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="3903" >
+<cdparam x="349" y="252" />
+<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2844" />
-<TGConnectingPoint num="1" id="2845" />
-<TGConnectingPoint num="2" id="2846" />
-<TGConnectingPoint num="3" id="2847" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<infoparam name="state0" value="testMAC1" />
+<TGConnectingPoint num="0" id="3863" />
+<TGConnectingPoint num="1" id="3864" />
+<TGConnectingPoint num="2" id="3865" />
+<TGConnectingPoint num="3" id="3866" />
+<TGConnectingPoint num="4" id="3867" />
+<TGConnectingPoint num="5" id="3868" />
+<TGConnectingPoint num="6" id="3869" />
+<TGConnectingPoint num="7" id="3870" />
+<TGConnectingPoint num="8" id="3871" />
+<TGConnectingPoint num="9" id="3872" />
+<TGConnectingPoint num="10" id="3873" />
+<TGConnectingPoint num="11" id="3874" />
+<TGConnectingPoint num="12" id="3875" />
+<TGConnectingPoint num="13" id="3876" />
+<TGConnectingPoint num="14" id="3877" />
+<TGConnectingPoint num="15" id="3878" />
+<TGConnectingPoint num="16" id="3879" />
+<TGConnectingPoint num="17" id="3880" />
+<TGConnectingPoint num="18" id="3881" />
+<TGConnectingPoint num="19" id="3882" />
+<TGConnectingPoint num="20" id="3883" />
+<TGConnectingPoint num="21" id="3884" />
+<TGConnectingPoint num="22" id="3885" />
+<TGConnectingPoint num="23" id="3886" />
+<TGConnectingPoint num="24" id="3887" />
+<TGConnectingPoint num="25" id="3888" />
+<TGConnectingPoint num="26" id="3889" />
+<TGConnectingPoint num="27" id="3890" />
+<TGConnectingPoint num="28" id="3891" />
+<TGConnectingPoint num="29" id="3892" />
+<TGConnectingPoint num="30" id="3893" />
+<TGConnectingPoint num="31" id="3894" />
+<TGConnectingPoint num="32" id="3895" />
+<TGConnectingPoint num="33" id="3896" />
+<TGConnectingPoint num="34" id="3897" />
+<TGConnectingPoint num="35" id="3898" />
+<TGConnectingPoint num="36" id="3899" />
+<TGConnectingPoint num="37" id="3900" />
+<TGConnectingPoint num="38" id="3901" />
+<TGConnectingPoint num="39" id="3902" />
 <extraparam>
-<guard value="[msg1.data == ACK ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="2857" >
-<cdparam x="249" y="524" />
+<COMPONENT type="5104" id="3914" >
+<cdparam x="358" y="142" />
+<sizeparam width="81" 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="1900" />
+<infoparam name="Send signal" value="chin(msg8)" />
+<TGConnectingPoint num="0" id="3904" />
+<TGConnectingPoint num="1" id="3905" />
+<TGConnectingPoint num="2" id="3906" />
+<TGConnectingPoint num="3" id="3907" />
+<TGConnectingPoint num="4" id="3908" />
+<TGConnectingPoint num="5" id="3909" />
+<TGConnectingPoint num="6" id="3910" />
+<TGConnectingPoint num="7" id="3911" />
+<TGConnectingPoint num="8" id="3912" />
+<TGConnectingPoint num="9" id="3913" />
+</COMPONENT>
+
+<COMPONENT type="5100" id="3916" >
+<cdparam x="391" y="104" />
+<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="1900" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="3915" />
+</COMPONENT>
+
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="5102" id="2815" >
+<cdparam x="225" y="74" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2856" />
-<P1  x="249" y="524" id="3157" />
-<P2  x="171" y="604" id="3062" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2814" />
+<P1  x="173" y="59" id="3247" />
+<P2  x="177" y="90" id="2887" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2855" >
-<father id="2857" num="0" />
-<cdparam x="160" y="553" />
-<sizeparam width="42" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2813" >
+<father id="2815" num="0" />
+<cdparam x="213" y="72" />
+<sizeparam width="136" 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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2851" />
-<TGConnectingPoint num="1" id="2852" />
-<TGConnectingPoint num="2" id="2853" />
-<TGConnectingPoint num="3" id="2854" />
+<TGConnectingPoint num="0" id="2809" />
+<TGConnectingPoint num="1" id="2810" />
+<TGConnectingPoint num="2" id="2811" />
+<TGConnectingPoint num="3" id="2812" />
 <extraparam>
-<guard value="[not(b)]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msga.data = SesK.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2864" >
-<cdparam x="302" y="524" />
+<CONNECTOR type="5102" id="2822" >
+<cdparam x="192" y="159" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="2863" />
-<P1  x="302" y="524" id="3158" />
-<P2  x="400" y="614" id="3103" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2821" />
+<P1  x="211" y="152" id="2901" />
+<P2  x="228" y="212" id="3236" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2862" >
-<father id="2864" num="0" />
-<cdparam x="357" y="554" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2820" >
+<father id="2822" num="0" />
+<cdparam x="274" y="126" />
+<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2858" />
-<TGConnectingPoint num="1" id="2859" />
-<TGConnectingPoint num="2" id="2860" />
-<TGConnectingPoint num="3" id="2861" />
+<TGConnectingPoint num="0" id="2816" />
+<TGConnectingPoint num="1" id="2817" />
+<TGConnectingPoint num="2" id="2818" />
+<TGConnectingPoint num="3" id="2819" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg1 = sencrypt(msga, PSK1)" />
+<actions value="msg2.data = groupid" />
+<actions value="msg3.data = timestamp" />
+<actions value="msg4 = concat3(msg1, msg2, msg3)" />
+<actions value="msg5 = MAC(msg4, PSK1)" />
+<actions value="msg6=concat2(msg4, msg5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2871" >
-<cdparam x="252" y="389" />
+<CONNECTOR type="5102" id="2829" >
+<cdparam x="512" y="848" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="2870" />
-<P1  x="252" y="389" id="3185" />
-<P2  x="276" y="484" id="3144" />
+<TGConnectingPoint num="0" id="2828" />
+<P1  x="530" y="917" id="2928" />
+<P2  x="530" y="985" id="2980" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="2869" >
-<father id="2871" num="0" />
-<cdparam x="252" y="429" />
-<sizeparam width="200" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2827" >
+<father id="2829" num="0" />
+<cdparam x="512" y="888" />
+<sizeparam width="10" 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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="2865" />
-<TGConnectingPoint num="1" id="2866" />
-<TGConnectingPoint num="2" id="2867" />
-<TGConnectingPoint num="3" id="2868" />
+<TGConnectingPoint num="0" id="2823" />
+<TGConnectingPoint num="1" id="2824" />
+<TGConnectingPoint num="2" id="2825" />
+<TGConnectingPoint num="3" id="2826" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg3, msg4)" />
-<actions value="get2(msg3, msg1, msg2)" />
-<actions value="b = verifyMAC(msg3, PSK1, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="2878" >
-<cdparam x="240" y="318" />
+<CONNECTOR type="5102" id="2836" >
+<cdparam x="512" y="778" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="2877" />
-<P1  x="240" y="318" id="3201" />
-<P2  x="252" y="359" id="3184" />
+<TGConnectingPoint num="0" id="2835" />
+<P1  x="523" y="778" id="3026" />
+<P2  x="530" y="887" id="2927" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2834" >
+<father id="2836" num="0" />
+<cdparam x="512" y="818" />
+<sizeparam width="174" height="60" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2830" />
+<TGConnectingPoint num="1" id="2831" />
+<TGConnectingPoint num="2" id="2832" />
+<TGConnectingPoint num="3" id="2833" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="msg4.data = confData" />
+<actions value="msg1 = sencrypt(msg4, SesK)" />
+<actions value="msg2 = MAC(msg1, SesK)" />
+<actions value="msg = concat2(msg1, msg2)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2843" >
+<cdparam x="363" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2842" />
+<P1  x="363" y="654" id="3116" />
+<P2  x="238" y="734" id="2939" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2841" >
+<father id="2843" num="0" />
+<cdparam x="254" y="699" />
+<sizeparam width="152" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2837" />
+<TGConnectingPoint num="1" id="2838" />
+<TGConnectingPoint num="2" id="2839" />
+<TGConnectingPoint num="3" id="2840" />
+<extraparam>
+<guard value="[not(msg1.data == ACK) ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2850" >
+<cdparam x="436" y="654" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2849" />
+<P1  x="436" y="654" id="3117" />
+<P2  x="523" y="738" id="3021" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2848" >
+<father id="2850" num="0" />
+<cdparam x="446" y="694" />
+<sizeparam width="126" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2844" />
+<TGConnectingPoint num="1" id="2845" />
+<TGConnectingPoint num="2" id="2846" />
+<TGConnectingPoint num="3" id="2847" />
+<extraparam>
+<guard value="[msg1.data == ACK ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2857" >
+<cdparam x="249" y="524" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2856" />
+<P1  x="249" y="524" id="3157" />
+<P2  x="171" y="604" id="3062" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2855" >
+<father id="2857" num="0" />
+<cdparam x="160" y="553" />
+<sizeparam width="42" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2851" />
+<TGConnectingPoint num="1" id="2852" />
+<TGConnectingPoint num="2" id="2853" />
+<TGConnectingPoint num="3" id="2854" />
+<extraparam>
+<guard value="[not(b)]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2864" >
+<cdparam x="302" y="524" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2863" />
+<P1  x="302" y="524" id="3158" />
+<P2  x="400" y="614" id="3103" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2862" >
+<father id="2864" num="0" />
+<cdparam x="357" y="554" />
+<sizeparam width="24" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2858" />
+<TGConnectingPoint num="1" id="2859" />
+<TGConnectingPoint num="2" id="2860" />
+<TGConnectingPoint num="3" id="2861" />
+<extraparam>
+<guard value="[ b ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2871" >
+<cdparam x="252" y="389" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2870" />
+<P1  x="252" y="389" id="3185" />
+<P2  x="276" y="484" id="3144" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2869" >
+<father id="2871" num="0" />
+<cdparam x="252" y="429" />
+<sizeparam width="200" height="45" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2865" />
+<TGConnectingPoint num="1" id="2866" />
+<TGConnectingPoint num="2" id="2867" />
+<TGConnectingPoint num="3" id="2868" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="get2(msg, msg3, msg4)" />
+<actions value="get2(msg3, msg1, msg2)" />
+<actions value="b = verifyMAC(msg3, PSK1, msg4)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="2878" >
+<cdparam x="240" y="318" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2877" />
+<P1  x="240" y="318" id="3201" />
+<P2  x="252" y="359" id="3184" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="2876" >
 <father id="2878" num="0" />
@@ -6099,86 +5781,86 @@ all subblocks
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="1900" >
-<CONNECTOR type="5102" id="3255" >
-<cdparam x="621" y="895" />
+<AVATARStateMachineDiagramPanel name="ECUN" minX="10" maxX="1400" minY="10" maxY="1400" >
+<CONNECTOR type="5102" id="2277" >
+<cdparam x="638" y="1030" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3254" />
-<P1  x="458" y="749" id="3382" />
-<P2  x="425" y="798" id="3410" />
+<TGConnectingPoint num="0" id="2276" />
+<P1  x="638" y="1030" id="2452" />
+<P2  x="656" y="1133" id="2365" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3253" >
-<father id="3255" num="0" />
-<cdparam x="270" y="771" />
-<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2275" >
+<father id="2277" num="0" />
+<cdparam x="654" y="1057" />
+<sizeparam width="217" 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="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3249" />
-<TGConnectingPoint num="1" id="3250" />
-<TGConnectingPoint num="2" id="3251" />
-<TGConnectingPoint num="3" id="3252" />
+<TGConnectingPoint num="0" id="2271" />
+<TGConnectingPoint num="1" id="2272" />
+<TGConnectingPoint num="2" id="2273" />
+<TGConnectingPoint num="3" id="2274" />
 <extraparam>
-<guard value="[msg.data == timerexpire.data ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="msg3 = sdecrypt(msg1, keyOfGroup)" />
+<actions value="secretData = msg3.data" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3262" >
-<cdparam x="654" y="890" />
+<CONNECTOR type="5102" id="2284" >
+<cdparam x="514" y="919" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3261" />
-<P1  x="488" y="749" id="3374" />
-<P2  x="611" y="797" id="3596" />
+<TGConnectingPoint num="0" id="2283" />
+<P1  x="514" y="919" id="2501" />
+<P2  x="417" y="985" id="2406" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3260" >
-<father id="3262" num="0" />
-<cdparam x="581" y="749" />
-<sizeparam width="217" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2282" >
+<father id="2284" num="0" />
+<cdparam x="413" y="957" />
+<sizeparam width="46" 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="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3256" />
-<TGConnectingPoint num="1" id="3257" />
-<TGConnectingPoint num="2" id="3258" />
-<TGConnectingPoint num="3" id="3259" />
+<TGConnectingPoint num="0" id="2278" />
+<TGConnectingPoint num="1" id="2279" />
+<TGConnectingPoint num="2" id="2280" />
+<TGConnectingPoint num="3" id="2281" />
 <extraparam>
-<guard value="[not(msg.data == timerexpire.data) ]" />
+<guard value="[ not(b)]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(msg, msg5, msg4)" />
-<actions value="b = verifyMAC(msg5, PSKN, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3269" >
-<cdparam x="524" y="710" />
+<CONNECTOR type="5102" id="2291" >
+<cdparam x="570" y="919" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3268" />
-<P1  x="489" y="594" id="3451" />
-<P2  x="488" y="613" id="3771" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="2290" />
+<P1  x="570" y="919" id="2502" />
+<P2  x="638" y="990" id="2447" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3267" >
-<father id="3269" num="0" />
-<cdparam x="524" y="750" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2289" >
+<father id="2291" num="0" />
+<cdparam x="570" y="959" />
+<sizeparam width="24" 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="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3263" />
-<TGConnectingPoint num="1" id="3264" />
-<TGConnectingPoint num="2" id="3265" />
-<TGConnectingPoint num="3" id="3266" />
+<TGConnectingPoint num="0" id="2285" />
+<TGConnectingPoint num="1" id="2286" />
+<TGConnectingPoint num="2" id="2287" />
+<TGConnectingPoint num="3" id="2288" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -6186,118 +5868,113 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3276" >
-<cdparam x="988" y="1206" />
+<CONNECTOR type="5102" id="2298" >
+<cdparam x="342" y="72" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3275" />
-<P1  x="611" y="980" id="3519" />
-<P2  x="611" y="1068" id="3461" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="2297" />
+<P1  x="342" y="72" id="2692" />
+<P2  x="342" y="100" id="2652" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3274" >
-<father id="3276" num="0" />
-<cdparam x="625" y="998" />
-<sizeparam width="175" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2296" >
+<father id="2298" num="0" />
+<cdparam x="342" y="112" />
+<sizeparam width="10" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3270" />
-<TGConnectingPoint num="1" id="3271" />
-<TGConnectingPoint num="2" id="3272" />
-<TGConnectingPoint num="3" id="3273" />
+<TGConnectingPoint num="0" id="2292" />
+<TGConnectingPoint num="1" id="2293" />
+<TGConnectingPoint num="2" id="2294" />
+<TGConnectingPoint num="3" id="2295" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg1.data = ACK" />
-<actions value="msg2.data = timestamp2" />
-<actions value="msg3 = concat2(msg1, msg2)" />
-<actions value="msg4 = MAC(msg3, PSK1)" />
-<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3283" >
-<cdparam x="427" y="156" />
+<CONNECTOR type="5102" id="2305" >
+<cdparam x="548" y="792" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3282" />
-<P1  x="398" y="124" id="3915" />
-<P2  x="398" y="137" id="3904" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="2304" />
+<P1  x="548" y="792" id="2706" />
+<P2  x="542" y="879" id="2488" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3281" >
-<father id="3283" num="0" />
-<cdparam x="427" y="196" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2303" >
+<father id="2305" num="0" />
+<cdparam x="548" y="832" />
+<sizeparam width="240" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3277" />
-<TGConnectingPoint num="1" id="3278" />
-<TGConnectingPoint num="2" id="3279" />
-<TGConnectingPoint num="3" id="3280" />
+<TGConnectingPoint num="0" id="2299" />
+<TGConnectingPoint num="1" id="2300" />
+<TGConnectingPoint num="2" id="2301" />
+<TGConnectingPoint num="3" id="2302" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg, msg1, msg2)" />
+<actions value="b = verifyMAC(msg1, keyOfGroup, msg2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3290" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="2312" >
+<cdparam x="434" y="475" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to stop state" value="null" />
-<TGConnectingPoint num="0" id="3289" />
-<P1  x="489" y="376" id="3642" />
-<P2  x="489" y="426" id="3678" />
+<TGConnectingPoint num="0" id="2311" />
+<P1  x="479" y="445" id="2783" />
+<P2  x="530" y="495" id="2611" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3288" >
-<father id="3290" num="0" />
-<cdparam x="513" y="397" />
-<sizeparam width="190" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2310" >
+<father id="2312" num="0" />
+<cdparam x="529" y="457" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3284" />
-<TGConnectingPoint num="1" id="3285" />
-<TGConnectingPoint num="2" id="3286" />
-<TGConnectingPoint num="3" id="3287" />
+<TGConnectingPoint num="0" id="2306" />
+<TGConnectingPoint num="1" id="2307" />
+<TGConnectingPoint num="2" id="2308" />
+<TGConnectingPoint num="3" id="2309" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[  ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get3(msg1, msg5, msg2, msg3)" />
-<actions value="msgauth= sdecrypt(msg5, PSK1)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3297" >
-<cdparam x="472" y="500" />
+<CONNECTOR type="5102" id="2319" >
+<cdparam x="486" y="696" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3296" />
-<P1  x="373" y="292" id="3877" />
-<P2  x="316" y="334" id="3823" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2318" />
+<P1  x="543" y="653" id="2758" />
+<P2  x="548" y="688" id="2717" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3295" >
-<father id="3297" num="0" />
-<cdparam x="208" y="317" />
-<sizeparam width="190" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2317" >
+<father id="2319" num="0" />
+<cdparam x="486" y="736" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3291" />
-<TGConnectingPoint num="1" id="3292" />
-<TGConnectingPoint num="2" id="3293" />
-<TGConnectingPoint num="3" id="3294" />
+<TGConnectingPoint num="0" id="2313" />
+<TGConnectingPoint num="1" id="2314" />
+<TGConnectingPoint num="2" id="2315" />
+<TGConnectingPoint num="3" id="2316" />
 <extraparam>
-<guard value="[not(msg8.data == msg4.data) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -6305,25 +5982,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3304" >
-<cdparam x="517" y="650" />
+<CONNECTOR type="5102" id="2326" >
+<cdparam x="548" y="728" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3303" />
-<P1  x="489" y="563" id="3812" />
-<P2  x="489" y="564" id="3450" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2325" />
+<P1  x="548" y="728" id="2722" />
+<P2  x="548" y="762" id="2705" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3302" >
-<father id="3304" num="0" />
-<cdparam x="517" y="690" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2324" >
+<father id="2326" num="0" />
+<cdparam x="548" y="768" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3298" />
-<TGConnectingPoint num="1" id="3299" />
-<TGConnectingPoint num="2" id="3300" />
-<TGConnectingPoint num="3" id="3301" />
+<TGConnectingPoint num="0" id="2320" />
+<TGConnectingPoint num="1" id="2321" />
+<TGConnectingPoint num="2" id="2322" />
+<TGConnectingPoint num="3" id="2323" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6333,53 +6010,54 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3311" >
-<cdparam x="710" y="775" />
+<CONNECTOR type="5102" id="2333" >
+<cdparam x="304" y="307" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3310" />
-<P1  x="488" y="689" id="3760" />
-<P2  x="488" y="709" id="3369" />
+<infoparam name="connector from Send signal to stop state" value="null" />
+<TGConnectingPoint num="0" id="2332" />
+<P1  x="429" y="362" id="2534" />
+<P2  x="454" y="405" id="2769" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3309" >
-<father id="3311" num="0" />
-<cdparam x="685" y="829" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2331" >
+<father id="2333" num="0" />
+<cdparam x="440" y="381" />
+<sizeparam width="201" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3305" />
-<TGConnectingPoint num="1" id="3306" />
-<TGConnectingPoint num="2" id="3307" />
-<TGConnectingPoint num="3" id="3308" />
+<TGConnectingPoint num="0" id="2327" />
+<TGConnectingPoint num="1" id="2328" />
+<TGConnectingPoint num="2" id="2329" />
+<TGConnectingPoint num="3" id="2330" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifyMAC(msg5, PSKN, msg6)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3318" >
-<cdparam x="413" y="171" />
+<CONNECTOR type="5102" id="2340" >
+<cdparam x="342" y="140" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3317" />
-<P1  x="398" y="167" id="3905" />
-<P2  x="398" y="177" id="3719" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2339" />
+<P1  x="342" y="140" id="2657" />
+<P2  x="350" y="173" id="2694" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3316" >
-<father id="3318" num="0" />
-<cdparam x="413" y="211" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2338" >
+<father id="2340" num="0" />
+<cdparam x="342" y="180" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3312" />
-<TGConnectingPoint num="1" id="3313" />
-<TGConnectingPoint num="2" id="3314" />
-<TGConnectingPoint num="3" id="3315" />
+<TGConnectingPoint num="0" id="2334" />
+<TGConnectingPoint num="1" id="2335" />
+<TGConnectingPoint num="2" id="2336" />
+<TGConnectingPoint num="3" id="2337" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -6389,907 +6067,669 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3325" >
-<cdparam x="820" y="859" />
+<CONNECTOR type="5102" id="2347" >
+<cdparam x="518" y="526" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to stop state" value="null" />
-<TGConnectingPoint num="0" id="3324" />
-<P1  x="611" y="837" id="3601" />
-<P2  x="611" y="874" id="3555" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="2346" />
+<P1  x="530" y="535" id="2616" />
+<P2  x="543" y="623" id="2757" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3323" >
-<father id="3325" num="0" />
-<cdparam x="626" y="851" />
-<sizeparam width="186" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2345" >
+<father id="2347" num="0" />
+<cdparam x="565" y="553" />
+<sizeparam width="179" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3319" />
-<TGConnectingPoint num="1" id="3320" />
-<TGConnectingPoint num="2" id="3321" />
-<TGConnectingPoint num="3" id="3322" />
+<TGConnectingPoint num="0" id="2341" />
+<TGConnectingPoint num="1" id="2342" />
+<TGConnectingPoint num="2" id="2343" />
+<TGConnectingPoint num="3" id="2344" />
 <extraparam>
-<guard value="[  ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get3(msg5, msg1, msg2, msg3)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3332" >
-<cdparam x="420" y="415" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3331" />
-<P1  x="398" y="217" id="3724" />
-<P2  x="398" y="252" id="3864" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3330" >
-<father id="3332" num="0" />
-<cdparam x="418" y="233" />
-<sizeparam width="153" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3326" />
-<TGConnectingPoint num="1" id="3327" />
-<TGConnectingPoint num="2" id="3328" />
-<TGConnectingPoint num="3" id="3329" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="get2(msg8, msg1, msg4)" />
-<actions value="msg8 = MAC(msg1, PSK1)" />
+<actions value="keyOfGroup.data = msg1.data" />
+<actions value="msg1.data = ACK" />
+<actions value="msg2.data = timestamp" />
+<actions value="msg3 = concat2(msg1, msg2)" />
+<actions value="msg4 = MAC(msg3, PSKN)" />
+<actions value="msg = concat2(msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3339" >
-<cdparam x="967" y="524" />
+<CONNECTOR type="5102" id="2354" >
+<cdparam x="350" y="203" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3338" />
-<P1  x="489" y="466" id="3683" />
-<P2  x="489" y="533" id="3811" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="2353" />
+<P1  x="350" y="203" id="2695" />
+<P2  x="406" y="238" id="2570" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3337" >
-<father id="3339" num="0" />
-<cdparam x="532" y="480" />
-<sizeparam width="255" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2352" >
+<father id="2354" num="0" />
+<cdparam x="350" y="243" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3333" />
-<TGConnectingPoint num="1" id="3334" />
-<TGConnectingPoint num="2" id="3335" />
-<TGConnectingPoint num="3" id="3336" />
+<TGConnectingPoint num="0" id="2348" />
+<TGConnectingPoint num="1" id="2349" />
+<TGConnectingPoint num="2" id="2350" />
+<TGConnectingPoint num="3" id="2351" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="msg7 = sencrypt(msgauth, PSKN)" />
-<actions value="msg3.data = timestamp1" />
-<actions value="msg1 = concat4(msg7, msg2, msg3, msg3)" />
-<actions value="msg4 = MAC(msg1, PSKN)" />
-<actions value="msg=concat2(msg1, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3346" >
-<cdparam x="433" y="416" />
+<CONNECTOR type="5102" id="2363" >
+<cdparam x="406" y="268" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3345" />
-<P1  x="398" y="292" id="3869" />
-<P2  x="489" y="336" id="3637" />
+<TGConnectingPoint num="0" id="2361" />
+<TGConnectingPoint num="1" id="2362" />
+<P1  x="406" y="268" id="2575" />
+<P2  x="429" y="322" id="2529" />
+<Point x="414" y="282" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3344" >
-<father id="3346" num="0" />
-<cdparam x="465" y="314" />
-<sizeparam width="160" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2355" >
+<father id="2363" num="0" />
+<cdparam x="414" y="282" />
+<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="900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3340" />
-<TGConnectingPoint num="1" id="3341" />
-<TGConnectingPoint num="2" id="3342" />
-<TGConnectingPoint num="3" id="3343" />
-<extraparam>
-<guard value="[msg8.data == msg4.data]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
+<infoparam name="point " value="null" />
 </SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="3353" >
-<cdparam x="604" y="757" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="3352" />
-<P1  x="488" y="653" id="3776" />
-<P2  x="488" y="659" id="3759" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3351" >
-<father id="3353" num="0" />
-<cdparam x="604" y="797" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="-1" id="2360" >
+<father id="2363" num="1" />
+<cdparam x="446" y="292" />
+<sizeparam width="226" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3347" />
-<TGConnectingPoint num="1" id="3348" />
-<TGConnectingPoint num="2" id="3349" />
-<TGConnectingPoint num="3" id="3350" />
+<TGConnectingPoint num="0" id="2356" />
+<TGConnectingPoint num="1" id="2357" />
+<TGConnectingPoint num="2" id="2358" />
+<TGConnectingPoint num="3" id="2359" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(msg, msg5, msg6)" />
+<actions value="get4(msg5, msg1, msg2, msg3, msg4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="3360" >
-<cdparam x="983" y="1157" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="3359" />
-<P1  x="611" y="914" id="3560" />
-<P2  x="611" y="940" id="3514" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3358" >
-<father id="3360" num="0" />
-<cdparam x="629" y="930" />
-<sizeparam width="130" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2404" >
+<cdparam x="595" y="1133" />
+<sizeparam width="122" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3354" />
-<TGConnectingPoint num="1" id="3355" />
-<TGConnectingPoint num="2" id="3356" />
-<TGConnectingPoint num="3" id="3357" />
+<infoparam name="state0" value="gotData" />
+<TGConnectingPoint num="0" id="2364" />
+<TGConnectingPoint num="1" id="2365" />
+<TGConnectingPoint num="2" id="2366" />
+<TGConnectingPoint num="3" id="2367" />
+<TGConnectingPoint num="4" id="2368" />
+<TGConnectingPoint num="5" id="2369" />
+<TGConnectingPoint num="6" id="2370" />
+<TGConnectingPoint num="7" id="2371" />
+<TGConnectingPoint num="8" id="2372" />
+<TGConnectingPoint num="9" id="2373" />
+<TGConnectingPoint num="10" id="2374" />
+<TGConnectingPoint num="11" id="2375" />
+<TGConnectingPoint num="12" id="2376" />
+<TGConnectingPoint num="13" id="2377" />
+<TGConnectingPoint num="14" id="2378" />
+<TGConnectingPoint num="15" id="2379" />
+<TGConnectingPoint num="16" id="2380" />
+<TGConnectingPoint num="17" id="2381" />
+<TGConnectingPoint num="18" id="2382" />
+<TGConnectingPoint num="19" id="2383" />
+<TGConnectingPoint num="20" id="2384" />
+<TGConnectingPoint num="21" id="2385" />
+<TGConnectingPoint num="22" id="2386" />
+<TGConnectingPoint num="23" id="2387" />
+<TGConnectingPoint num="24" id="2388" />
+<TGConnectingPoint num="25" id="2389" />
+<TGConnectingPoint num="26" id="2390" />
+<TGConnectingPoint num="27" id="2391" />
+<TGConnectingPoint num="28" id="2392" />
+<TGConnectingPoint num="29" id="2393" />
+<TGConnectingPoint num="30" id="2394" />
+<TGConnectingPoint num="31" id="2395" />
+<TGConnectingPoint num="32" id="2396" />
+<TGConnectingPoint num="33" id="2397" />
+<TGConnectingPoint num="34" id="2398" />
+<TGConnectingPoint num="35" id="2399" />
+<TGConnectingPoint num="36" id="2400" />
+<TGConnectingPoint num="37" id="2401" />
+<TGConnectingPoint num="38" id="2402" />
+<TGConnectingPoint num="39" id="2403" />
 <extraparam>
-<guard value="[msg1.data == ACK  ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="3367" >
-<cdparam x="732" y="1157" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="3366" />
-<P1  x="611" y="1098" id="3462" />
-<P2  x="610" y="1117" id="3473" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="3365" >
-<father id="3367" num="0" />
-<cdparam x="732" y="1197" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2445" >
+<cdparam x="366" y="985" />
+<sizeparam width="102" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="3361" />
-<TGConnectingPoint num="1" id="3362" />
-<TGConnectingPoint num="2" id="3363" />
-<TGConnectingPoint num="3" id="3364" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5106" id="3408" >
-<cdparam x="429" y="709" />
-<sizeparam width="118" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="state0" />
-<TGConnectingPoint num="0" id="3368" />
-<TGConnectingPoint num="1" id="3369" />
-<TGConnectingPoint num="2" id="3370" />
-<TGConnectingPoint num="3" id="3371" />
-<TGConnectingPoint num="4" id="3372" />
-<TGConnectingPoint num="5" id="3373" />
-<TGConnectingPoint num="6" id="3374" />
-<TGConnectingPoint num="7" id="3375" />
-<TGConnectingPoint num="8" id="3376" />
-<TGConnectingPoint num="9" id="3377" />
-<TGConnectingPoint num="10" id="3378" />
-<TGConnectingPoint num="11" id="3379" />
-<TGConnectingPoint num="12" id="3380" />
-<TGConnectingPoint num="13" id="3381" />
-<TGConnectingPoint num="14" id="3382" />
-<TGConnectingPoint num="15" id="3383" />
-<TGConnectingPoint num="16" id="3384" />
-<TGConnectingPoint num="17" id="3385" />
-<TGConnectingPoint num="18" id="3386" />
-<TGConnectingPoint num="19" id="3387" />
-<TGConnectingPoint num="20" id="3388" />
-<TGConnectingPoint num="21" id="3389" />
-<TGConnectingPoint num="22" id="3390" />
-<TGConnectingPoint num="23" id="3391" />
-<TGConnectingPoint num="24" id="3392" />
-<TGConnectingPoint num="25" id="3393" />
-<TGConnectingPoint num="26" id="3394" />
-<TGConnectingPoint num="27" id="3395" />
-<TGConnectingPoint num="28" id="3396" />
-<TGConnectingPoint num="29" id="3397" />
-<TGConnectingPoint num="30" id="3398" />
-<TGConnectingPoint num="31" id="3399" />
-<TGConnectingPoint num="32" id="3400" />
-<TGConnectingPoint num="33" id="3401" />
-<TGConnectingPoint num="34" id="3402" />
-<TGConnectingPoint num="35" id="3403" />
-<TGConnectingPoint num="36" id="3404" />
-<TGConnectingPoint num="37" id="3405" />
-<TGConnectingPoint num="38" id="3406" />
-<TGConnectingPoint num="39" id="3407" />
+<infoparam name="state0" value="MacDataFailed" />
+<TGConnectingPoint num="0" id="2405" />
+<TGConnectingPoint num="1" id="2406" />
+<TGConnectingPoint num="2" id="2407" />
+<TGConnectingPoint num="3" id="2408" />
+<TGConnectingPoint num="4" id="2409" />
+<TGConnectingPoint num="5" id="2410" />
+<TGConnectingPoint num="6" id="2411" />
+<TGConnectingPoint num="7" id="2412" />
+<TGConnectingPoint num="8" id="2413" />
+<TGConnectingPoint num="9" id="2414" />
+<TGConnectingPoint num="10" id="2415" />
+<TGConnectingPoint num="11" id="2416" />
+<TGConnectingPoint num="12" id="2417" />
+<TGConnectingPoint num="13" id="2418" />
+<TGConnectingPoint num="14" id="2419" />
+<TGConnectingPoint num="15" id="2420" />
+<TGConnectingPoint num="16" id="2421" />
+<TGConnectingPoint num="17" id="2422" />
+<TGConnectingPoint num="18" id="2423" />
+<TGConnectingPoint num="19" id="2424" />
+<TGConnectingPoint num="20" id="2425" />
+<TGConnectingPoint num="21" id="2426" />
+<TGConnectingPoint num="22" id="2427" />
+<TGConnectingPoint num="23" id="2428" />
+<TGConnectingPoint num="24" id="2429" />
+<TGConnectingPoint num="25" id="2430" />
+<TGConnectingPoint num="26" id="2431" />
+<TGConnectingPoint num="27" id="2432" />
+<TGConnectingPoint num="28" id="2433" />
+<TGConnectingPoint num="29" id="2434" />
+<TGConnectingPoint num="30" id="2435" />
+<TGConnectingPoint num="31" id="2436" />
+<TGConnectingPoint num="32" id="2437" />
+<TGConnectingPoint num="33" id="2438" />
+<TGConnectingPoint num="34" id="2439" />
+<TGConnectingPoint num="35" id="2440" />
+<TGConnectingPoint num="36" id="2441" />
+<TGConnectingPoint num="37" id="2442" />
+<TGConnectingPoint num="38" id="2443" />
+<TGConnectingPoint num="39" id="2444" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3449" >
-<cdparam x="335" y="798" />
-<sizeparam width="181" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2486" >
+<cdparam x="580" y="990" />
+<sizeparam width="116" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="timerExpired" />
-<TGConnectingPoint num="0" id="3409" />
-<TGConnectingPoint num="1" id="3410" />
-<TGConnectingPoint num="2" id="3411" />
-<TGConnectingPoint num="3" id="3412" />
-<TGConnectingPoint num="4" id="3413" />
-<TGConnectingPoint num="5" id="3414" />
-<TGConnectingPoint num="6" id="3415" />
-<TGConnectingPoint num="7" id="3416" />
-<TGConnectingPoint num="8" id="3417" />
-<TGConnectingPoint num="9" id="3418" />
-<TGConnectingPoint num="10" id="3419" />
-<TGConnectingPoint num="11" id="3420" />
-<TGConnectingPoint num="12" id="3421" />
-<TGConnectingPoint num="13" id="3422" />
-<TGConnectingPoint num="14" id="3423" />
-<TGConnectingPoint num="15" id="3424" />
-<TGConnectingPoint num="16" id="3425" />
-<TGConnectingPoint num="17" id="3426" />
-<TGConnectingPoint num="18" id="3427" />
-<TGConnectingPoint num="19" id="3428" />
-<TGConnectingPoint num="20" id="3429" />
-<TGConnectingPoint num="21" id="3430" />
-<TGConnectingPoint num="22" id="3431" />
-<TGConnectingPoint num="23" id="3432" />
-<TGConnectingPoint num="24" id="3433" />
-<TGConnectingPoint num="25" id="3434" />
-<TGConnectingPoint num="26" id="3435" />
-<TGConnectingPoint num="27" id="3436" />
-<TGConnectingPoint num="28" id="3437" />
-<TGConnectingPoint num="29" id="3438" />
-<TGConnectingPoint num="30" id="3439" />
-<TGConnectingPoint num="31" id="3440" />
-<TGConnectingPoint num="32" id="3441" />
-<TGConnectingPoint num="33" id="3442" />
-<TGConnectingPoint num="34" id="3443" />
-<TGConnectingPoint num="35" id="3444" />
-<TGConnectingPoint num="36" id="3445" />
-<TGConnectingPoint num="37" id="3446" />
-<TGConnectingPoint num="38" id="3447" />
-<TGConnectingPoint num="39" id="3448" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="MACDataOK" />
+<TGConnectingPoint num="0" id="2446" />
+<TGConnectingPoint num="1" id="2447" />
+<TGConnectingPoint num="2" id="2448" />
+<TGConnectingPoint num="3" id="2449" />
+<TGConnectingPoint num="4" id="2450" />
+<TGConnectingPoint num="5" id="2451" />
+<TGConnectingPoint num="6" id="2452" />
+<TGConnectingPoint num="7" id="2453" />
+<TGConnectingPoint num="8" id="2454" />
+<TGConnectingPoint num="9" id="2455" />
+<TGConnectingPoint num="10" id="2456" />
+<TGConnectingPoint num="11" id="2457" />
+<TGConnectingPoint num="12" id="2458" />
+<TGConnectingPoint num="13" id="2459" />
+<TGConnectingPoint num="14" id="2460" />
+<TGConnectingPoint num="15" id="2461" />
+<TGConnectingPoint num="16" id="2462" />
+<TGConnectingPoint num="17" id="2463" />
+<TGConnectingPoint num="18" id="2464" />
+<TGConnectingPoint num="19" id="2465" />
+<TGConnectingPoint num="20" id="2466" />
+<TGConnectingPoint num="21" id="2467" />
+<TGConnectingPoint num="22" id="2468" />
+<TGConnectingPoint num="23" id="2469" />
+<TGConnectingPoint num="24" id="2470" />
+<TGConnectingPoint num="25" id="2471" />
+<TGConnectingPoint num="26" id="2472" />
+<TGConnectingPoint num="27" id="2473" />
+<TGConnectingPoint num="28" id="2474" />
+<TGConnectingPoint num="29" id="2475" />
+<TGConnectingPoint num="30" id="2476" />
+<TGConnectingPoint num="31" id="2477" />
+<TGConnectingPoint num="32" id="2478" />
+<TGConnectingPoint num="33" id="2479" />
+<TGConnectingPoint num="34" id="2480" />
+<TGConnectingPoint num="35" id="2481" />
+<TGConnectingPoint num="36" id="2482" />
+<TGConnectingPoint num="37" id="2483" />
+<TGConnectingPoint num="38" id="2484" />
+<TGConnectingPoint num="39" id="2485" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3460" >
-<cdparam x="441" y="569" />
-<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="1900" />
-<infoparam name="Send signal" value="chout(settimer)" />
-<TGConnectingPoint num="0" id="3450" />
-<TGConnectingPoint num="1" id="3451" />
-<TGConnectingPoint num="2" id="3452" />
-<TGConnectingPoint num="3" id="3453" />
-<TGConnectingPoint num="4" id="3454" />
-<TGConnectingPoint num="5" id="3455" />
-<TGConnectingPoint num="6" id="3456" />
-<TGConnectingPoint num="7" id="3457" />
-<TGConnectingPoint num="8" id="3458" />
-<TGConnectingPoint num="9" id="3459" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="3471" >
-<cdparam x="575" y="1073" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2527" >
+<cdparam x="486" y="879" />
+<sizeparam width="113" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="3461" />
-<TGConnectingPoint num="1" id="3462" />
-<TGConnectingPoint num="2" id="3463" />
-<TGConnectingPoint num="3" id="3464" />
-<TGConnectingPoint num="4" id="3465" />
-<TGConnectingPoint num="5" id="3466" />
-<TGConnectingPoint num="6" id="3467" />
-<TGConnectingPoint num="7" id="3468" />
-<TGConnectingPoint num="8" id="3469" />
-<TGConnectingPoint num="9" id="3470" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testingMAC" />
+<TGConnectingPoint num="0" id="2487" />
+<TGConnectingPoint num="1" id="2488" />
+<TGConnectingPoint num="2" id="2489" />
+<TGConnectingPoint num="3" id="2490" />
+<TGConnectingPoint num="4" id="2491" />
+<TGConnectingPoint num="5" id="2492" />
+<TGConnectingPoint num="6" id="2493" />
+<TGConnectingPoint num="7" id="2494" />
+<TGConnectingPoint num="8" id="2495" />
+<TGConnectingPoint num="9" id="2496" />
+<TGConnectingPoint num="10" id="2497" />
+<TGConnectingPoint num="11" id="2498" />
+<TGConnectingPoint num="12" id="2499" />
+<TGConnectingPoint num="13" id="2500" />
+<TGConnectingPoint num="14" id="2501" />
+<TGConnectingPoint num="15" id="2502" />
+<TGConnectingPoint num="16" id="2503" />
+<TGConnectingPoint num="17" id="2504" />
+<TGConnectingPoint num="18" id="2505" />
+<TGConnectingPoint num="19" id="2506" />
+<TGConnectingPoint num="20" id="2507" />
+<TGConnectingPoint num="21" id="2508" />
+<TGConnectingPoint num="22" id="2509" />
+<TGConnectingPoint num="23" id="2510" />
+<TGConnectingPoint num="24" id="2511" />
+<TGConnectingPoint num="25" id="2512" />
+<TGConnectingPoint num="26" id="2513" />
+<TGConnectingPoint num="27" id="2514" />
+<TGConnectingPoint num="28" id="2515" />
+<TGConnectingPoint num="29" id="2516" />
+<TGConnectingPoint num="30" id="2517" />
+<TGConnectingPoint num="31" id="2518" />
+<TGConnectingPoint num="32" id="2519" />
+<TGConnectingPoint num="33" id="2520" />
+<TGConnectingPoint num="34" id="2521" />
+<TGConnectingPoint num="35" id="2522" />
+<TGConnectingPoint num="36" id="2523" />
+<TGConnectingPoint num="37" id="2524" />
+<TGConnectingPoint num="38" id="2525" />
+<TGConnectingPoint num="39" id="2526" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3512" >
-<cdparam x="513" y="1117" />
-<sizeparam width="194" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2568" >
+<cdparam x="353" y="322" />
+<sizeparam width="153" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_FORWARDED" />
-<TGConnectingPoint num="0" id="3472" />
-<TGConnectingPoint num="1" id="3473" />
-<TGConnectingPoint num="2" id="3474" />
-<TGConnectingPoint num="3" id="3475" />
-<TGConnectingPoint num="4" id="3476" />
-<TGConnectingPoint num="5" id="3477" />
-<TGConnectingPoint num="6" id="3478" />
-<TGConnectingPoint num="7" id="3479" />
-<TGConnectingPoint num="8" id="3480" />
-<TGConnectingPoint num="9" id="3481" />
-<TGConnectingPoint num="10" id="3482" />
-<TGConnectingPoint num="11" id="3483" />
-<TGConnectingPoint num="12" id="3484" />
-<TGConnectingPoint num="13" id="3485" />
-<TGConnectingPoint num="14" id="3486" />
-<TGConnectingPoint num="15" id="3487" />
-<TGConnectingPoint num="16" id="3488" />
-<TGConnectingPoint num="17" id="3489" />
-<TGConnectingPoint num="18" id="3490" />
-<TGConnectingPoint num="19" id="3491" />
-<TGConnectingPoint num="20" id="3492" />
-<TGConnectingPoint num="21" id="3493" />
-<TGConnectingPoint num="22" id="3494" />
-<TGConnectingPoint num="23" id="3495" />
-<TGConnectingPoint num="24" id="3496" />
-<TGConnectingPoint num="25" id="3497" />
-<TGConnectingPoint num="26" id="3498" />
-<TGConnectingPoint num="27" id="3499" />
-<TGConnectingPoint num="28" id="3500" />
-<TGConnectingPoint num="29" id="3501" />
-<TGConnectingPoint num="30" id="3502" />
-<TGConnectingPoint num="31" id="3503" />
-<TGConnectingPoint num="32" id="3504" />
-<TGConnectingPoint num="33" id="3505" />
-<TGConnectingPoint num="34" id="3506" />
-<TGConnectingPoint num="35" id="3507" />
-<TGConnectingPoint num="36" id="3508" />
-<TGConnectingPoint num="37" id="3509" />
-<TGConnectingPoint num="38" id="3510" />
-<TGConnectingPoint num="39" id="3511" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3553" >
-<cdparam x="539" y="940" />
-<sizeparam width="144" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="ACK_OK" />
-<TGConnectingPoint num="0" id="3513" />
-<TGConnectingPoint num="1" id="3514" />
-<TGConnectingPoint num="2" id="3515" />
-<TGConnectingPoint num="3" id="3516" />
-<TGConnectingPoint num="4" id="3517" />
-<TGConnectingPoint num="5" id="3518" />
-<TGConnectingPoint num="6" id="3519" />
-<TGConnectingPoint num="7" id="3520" />
-<TGConnectingPoint num="8" id="3521" />
-<TGConnectingPoint num="9" id="3522" />
-<TGConnectingPoint num="10" id="3523" />
-<TGConnectingPoint num="11" id="3524" />
-<TGConnectingPoint num="12" id="3525" />
-<TGConnectingPoint num="13" id="3526" />
-<TGConnectingPoint num="14" id="3527" />
-<TGConnectingPoint num="15" id="3528" />
-<TGConnectingPoint num="16" id="3529" />
-<TGConnectingPoint num="17" id="3530" />
-<TGConnectingPoint num="18" id="3531" />
-<TGConnectingPoint num="19" id="3532" />
-<TGConnectingPoint num="20" id="3533" />
-<TGConnectingPoint num="21" id="3534" />
-<TGConnectingPoint num="22" id="3535" />
-<TGConnectingPoint num="23" id="3536" />
-<TGConnectingPoint num="24" id="3537" />
-<TGConnectingPoint num="25" id="3538" />
-<TGConnectingPoint num="26" id="3539" />
-<TGConnectingPoint num="27" id="3540" />
-<TGConnectingPoint num="28" id="3541" />
-<TGConnectingPoint num="29" id="3542" />
-<TGConnectingPoint num="30" id="3543" />
-<TGConnectingPoint num="31" id="3544" />
-<TGConnectingPoint num="32" id="3545" />
-<TGConnectingPoint num="33" id="3546" />
-<TGConnectingPoint num="34" id="3547" />
-<TGConnectingPoint num="35" id="3548" />
-<TGConnectingPoint num="36" id="3549" />
-<TGConnectingPoint num="37" id="3550" />
-<TGConnectingPoint num="38" id="3551" />
-<TGConnectingPoint num="39" id="3552" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3594" >
-<cdparam x="552" y="874" />
-<sizeparam width="119" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACK" />
-<TGConnectingPoint num="0" id="3554" />
-<TGConnectingPoint num="1" id="3555" />
-<TGConnectingPoint num="2" id="3556" />
-<TGConnectingPoint num="3" id="3557" />
-<TGConnectingPoint num="4" id="3558" />
-<TGConnectingPoint num="5" id="3559" />
-<TGConnectingPoint num="6" id="3560" />
-<TGConnectingPoint num="7" id="3561" />
-<TGConnectingPoint num="8" id="3562" />
-<TGConnectingPoint num="9" id="3563" />
-<TGConnectingPoint num="10" id="3564" />
-<TGConnectingPoint num="11" id="3565" />
-<TGConnectingPoint num="12" id="3566" />
-<TGConnectingPoint num="13" id="3567" />
-<TGConnectingPoint num="14" id="3568" />
-<TGConnectingPoint num="15" id="3569" />
-<TGConnectingPoint num="16" id="3570" />
-<TGConnectingPoint num="17" id="3571" />
-<TGConnectingPoint num="18" id="3572" />
-<TGConnectingPoint num="19" id="3573" />
-<TGConnectingPoint num="20" id="3574" />
-<TGConnectingPoint num="21" id="3575" />
-<TGConnectingPoint num="22" id="3576" />
-<TGConnectingPoint num="23" id="3577" />
-<TGConnectingPoint num="24" id="3578" />
-<TGConnectingPoint num="25" id="3579" />
-<TGConnectingPoint num="26" id="3580" />
-<TGConnectingPoint num="27" id="3581" />
-<TGConnectingPoint num="28" id="3582" />
-<TGConnectingPoint num="29" id="3583" />
-<TGConnectingPoint num="30" id="3584" />
-<TGConnectingPoint num="31" id="3585" />
-<TGConnectingPoint num="32" id="3586" />
-<TGConnectingPoint num="33" id="3587" />
-<TGConnectingPoint num="34" id="3588" />
-<TGConnectingPoint num="35" id="3589" />
-<TGConnectingPoint num="36" id="3590" />
-<TGConnectingPoint num="37" id="3591" />
-<TGConnectingPoint num="38" id="3592" />
-<TGConnectingPoint num="39" id="3593" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3635" >
-<cdparam x="532" y="797" />
-<sizeparam width="158" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="CheckACKMAC" />
-<TGConnectingPoint num="0" id="3595" />
-<TGConnectingPoint num="1" id="3596" />
-<TGConnectingPoint num="2" id="3597" />
-<TGConnectingPoint num="3" id="3598" />
-<TGConnectingPoint num="4" id="3599" />
-<TGConnectingPoint num="5" id="3600" />
-<TGConnectingPoint num="6" id="3601" />
-<TGConnectingPoint num="7" id="3602" />
-<TGConnectingPoint num="8" id="3603" />
-<TGConnectingPoint num="9" id="3604" />
-<TGConnectingPoint num="10" id="3605" />
-<TGConnectingPoint num="11" id="3606" />
-<TGConnectingPoint num="12" id="3607" />
-<TGConnectingPoint num="13" id="3608" />
-<TGConnectingPoint num="14" id="3609" />
-<TGConnectingPoint num="15" id="3610" />
-<TGConnectingPoint num="16" id="3611" />
-<TGConnectingPoint num="17" id="3612" />
-<TGConnectingPoint num="18" id="3613" />
-<TGConnectingPoint num="19" id="3614" />
-<TGConnectingPoint num="20" id="3615" />
-<TGConnectingPoint num="21" id="3616" />
-<TGConnectingPoint num="22" id="3617" />
-<TGConnectingPoint num="23" id="3618" />
-<TGConnectingPoint num="24" id="3619" />
-<TGConnectingPoint num="25" id="3620" />
-<TGConnectingPoint num="26" id="3621" />
-<TGConnectingPoint num="27" id="3622" />
-<TGConnectingPoint num="28" id="3623" />
-<TGConnectingPoint num="29" id="3624" />
-<TGConnectingPoint num="30" id="3625" />
-<TGConnectingPoint num="31" id="3626" />
-<TGConnectingPoint num="32" id="3627" />
-<TGConnectingPoint num="33" id="3628" />
-<TGConnectingPoint num="34" id="3629" />
-<TGConnectingPoint num="35" id="3630" />
-<TGConnectingPoint num="36" id="3631" />
-<TGConnectingPoint num="37" id="3632" />
-<TGConnectingPoint num="38" id="3633" />
-<TGConnectingPoint num="39" id="3634" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3676" >
-<cdparam x="394" y="336" />
-<sizeparam width="191" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="testMAC_OK" />
-<TGConnectingPoint num="0" id="3636" />
-<TGConnectingPoint num="1" id="3637" />
-<TGConnectingPoint num="2" id="3638" />
-<TGConnectingPoint num="3" id="3639" />
-<TGConnectingPoint num="4" id="3640" />
-<TGConnectingPoint num="5" id="3641" />
-<TGConnectingPoint num="6" id="3642" />
-<TGConnectingPoint num="7" id="3643" />
-<TGConnectingPoint num="8" id="3644" />
-<TGConnectingPoint num="9" id="3645" />
-<TGConnectingPoint num="10" id="3646" />
-<TGConnectingPoint num="11" id="3647" />
-<TGConnectingPoint num="12" id="3648" />
-<TGConnectingPoint num="13" id="3649" />
-<TGConnectingPoint num="14" id="3650" />
-<TGConnectingPoint num="15" id="3651" />
-<TGConnectingPoint num="16" id="3652" />
-<TGConnectingPoint num="17" id="3653" />
-<TGConnectingPoint num="18" id="3654" />
-<TGConnectingPoint num="19" id="3655" />
-<TGConnectingPoint num="20" id="3656" />
-<TGConnectingPoint num="21" id="3657" />
-<TGConnectingPoint num="22" id="3658" />
-<TGConnectingPoint num="23" id="3659" />
-<TGConnectingPoint num="24" id="3660" />
-<TGConnectingPoint num="25" id="3661" />
-<TGConnectingPoint num="26" id="3662" />
-<TGConnectingPoint num="27" id="3663" />
-<TGConnectingPoint num="28" id="3664" />
-<TGConnectingPoint num="29" id="3665" />
-<TGConnectingPoint num="30" id="3666" />
-<TGConnectingPoint num="31" id="3667" />
-<TGConnectingPoint num="32" id="3668" />
-<TGConnectingPoint num="33" id="3669" />
-<TGConnectingPoint num="34" id="3670" />
-<TGConnectingPoint num="35" id="3671" />
-<TGConnectingPoint num="36" id="3672" />
-<TGConnectingPoint num="37" id="3673" />
-<TGConnectingPoint num="38" id="3674" />
-<TGConnectingPoint num="39" id="3675" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="3717" >
-<cdparam x="411" y="426" />
-<sizeparam width="157" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="decipherOK" />
-<TGConnectingPoint num="0" id="3677" />
-<TGConnectingPoint num="1" id="3678" />
-<TGConnectingPoint num="2" id="3679" />
-<TGConnectingPoint num="3" id="3680" />
-<TGConnectingPoint num="4" id="3681" />
-<TGConnectingPoint num="5" id="3682" />
-<TGConnectingPoint num="6" id="3683" />
-<TGConnectingPoint num="7" id="3684" />
-<TGConnectingPoint num="8" id="3685" />
-<TGConnectingPoint num="9" id="3686" />
-<TGConnectingPoint num="10" id="3687" />
-<TGConnectingPoint num="11" id="3688" />
-<TGConnectingPoint num="12" id="3689" />
-<TGConnectingPoint num="13" id="3690" />
-<TGConnectingPoint num="14" id="3691" />
-<TGConnectingPoint num="15" id="3692" />
-<TGConnectingPoint num="16" id="3693" />
-<TGConnectingPoint num="17" id="3694" />
-<TGConnectingPoint num="18" id="3695" />
-<TGConnectingPoint num="19" id="3696" />
-<TGConnectingPoint num="20" id="3697" />
-<TGConnectingPoint num="21" id="3698" />
-<TGConnectingPoint num="22" id="3699" />
-<TGConnectingPoint num="23" id="3700" />
-<TGConnectingPoint num="24" id="3701" />
-<TGConnectingPoint num="25" id="3702" />
-<TGConnectingPoint num="26" id="3703" />
-<TGConnectingPoint num="27" id="3704" />
-<TGConnectingPoint num="28" id="3705" />
-<TGConnectingPoint num="29" id="3706" />
-<TGConnectingPoint num="30" id="3707" />
-<TGConnectingPoint num="31" id="3708" />
-<TGConnectingPoint num="32" id="3709" />
-<TGConnectingPoint num="33" id="3710" />
-<TGConnectingPoint num="34" id="3711" />
-<TGConnectingPoint num="35" id="3712" />
-<TGConnectingPoint num="36" id="3713" />
-<TGConnectingPoint num="37" id="3714" />
-<TGConnectingPoint num="38" id="3715" />
-<TGConnectingPoint num="39" id="3716" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC0" />
+<TGConnectingPoint num="0" id="2528" />
+<TGConnectingPoint num="1" id="2529" />
+<TGConnectingPoint num="2" id="2530" />
+<TGConnectingPoint num="3" id="2531" />
+<TGConnectingPoint num="4" id="2532" />
+<TGConnectingPoint num="5" id="2533" />
+<TGConnectingPoint num="6" id="2534" />
+<TGConnectingPoint num="7" id="2535" />
+<TGConnectingPoint num="8" id="2536" />
+<TGConnectingPoint num="9" id="2537" />
+<TGConnectingPoint num="10" id="2538" />
+<TGConnectingPoint num="11" id="2539" />
+<TGConnectingPoint num="12" id="2540" />
+<TGConnectingPoint num="13" id="2541" />
+<TGConnectingPoint num="14" id="2542" />
+<TGConnectingPoint num="15" id="2543" />
+<TGConnectingPoint num="16" id="2544" />
+<TGConnectingPoint num="17" id="2545" />
+<TGConnectingPoint num="18" id="2546" />
+<TGConnectingPoint num="19" id="2547" />
+<TGConnectingPoint num="20" id="2548" />
+<TGConnectingPoint num="21" id="2549" />
+<TGConnectingPoint num="22" id="2550" />
+<TGConnectingPoint num="23" id="2551" />
+<TGConnectingPoint num="24" id="2552" />
+<TGConnectingPoint num="25" id="2553" />
+<TGConnectingPoint num="26" id="2554" />
+<TGConnectingPoint num="27" id="2555" />
+<TGConnectingPoint num="28" id="2556" />
+<TGConnectingPoint num="29" id="2557" />
+<TGConnectingPoint num="30" id="2558" />
+<TGConnectingPoint num="31" id="2559" />
+<TGConnectingPoint num="32" id="2560" />
+<TGConnectingPoint num="33" id="2561" />
+<TGConnectingPoint num="34" id="2562" />
+<TGConnectingPoint num="35" id="2563" />
+<TGConnectingPoint num="36" id="2564" />
+<TGConnectingPoint num="37" id="2565" />
+<TGConnectingPoint num="38" id="2566" />
+<TGConnectingPoint num="39" id="2567" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3758" >
-<cdparam x="314" y="177" />
-<sizeparam width="168" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2609" >
+<cdparam x="311" y="238" />
+<sizeparam width="190" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="gotFirstMessage" />
-<TGConnectingPoint num="0" id="3718" />
-<TGConnectingPoint num="1" id="3719" />
-<TGConnectingPoint num="2" id="3720" />
-<TGConnectingPoint num="3" id="3721" />
-<TGConnectingPoint num="4" id="3722" />
-<TGConnectingPoint num="5" id="3723" />
-<TGConnectingPoint num="6" id="3724" />
-<TGConnectingPoint num="7" id="3725" />
-<TGConnectingPoint num="8" id="3726" />
-<TGConnectingPoint num="9" id="3727" />
-<TGConnectingPoint num="10" id="3728" />
-<TGConnectingPoint num="11" id="3729" />
-<TGConnectingPoint num="12" id="3730" />
-<TGConnectingPoint num="13" id="3731" />
-<TGConnectingPoint num="14" id="3732" />
-<TGConnectingPoint num="15" id="3733" />
-<TGConnectingPoint num="16" id="3734" />
-<TGConnectingPoint num="17" id="3735" />
-<TGConnectingPoint num="18" id="3736" />
-<TGConnectingPoint num="19" id="3737" />
-<TGConnectingPoint num="20" id="3738" />
-<TGConnectingPoint num="21" id="3739" />
-<TGConnectingPoint num="22" id="3740" />
-<TGConnectingPoint num="23" id="3741" />
-<TGConnectingPoint num="24" id="3742" />
-<TGConnectingPoint num="25" id="3743" />
-<TGConnectingPoint num="26" id="3744" />
-<TGConnectingPoint num="27" id="3745" />
-<TGConnectingPoint num="28" id="3746" />
-<TGConnectingPoint num="29" id="3747" />
-<TGConnectingPoint num="30" id="3748" />
-<TGConnectingPoint num="31" id="3749" />
-<TGConnectingPoint num="32" id="3750" />
-<TGConnectingPoint num="33" id="3751" />
-<TGConnectingPoint num="34" id="3752" />
-<TGConnectingPoint num="35" id="3753" />
-<TGConnectingPoint num="36" id="3754" />
-<TGConnectingPoint num="37" id="3755" />
-<TGConnectingPoint num="38" id="3756" />
-<TGConnectingPoint num="39" id="3757" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="GotMessage" />
+<TGConnectingPoint num="0" id="2569" />
+<TGConnectingPoint num="1" id="2570" />
+<TGConnectingPoint num="2" id="2571" />
+<TGConnectingPoint num="3" id="2572" />
+<TGConnectingPoint num="4" id="2573" />
+<TGConnectingPoint num="5" id="2574" />
+<TGConnectingPoint num="6" id="2575" />
+<TGConnectingPoint num="7" id="2576" />
+<TGConnectingPoint num="8" id="2577" />
+<TGConnectingPoint num="9" id="2578" />
+<TGConnectingPoint num="10" id="2579" />
+<TGConnectingPoint num="11" id="2580" />
+<TGConnectingPoint num="12" id="2581" />
+<TGConnectingPoint num="13" id="2582" />
+<TGConnectingPoint num="14" id="2583" />
+<TGConnectingPoint num="15" id="2584" />
+<TGConnectingPoint num="16" id="2585" />
+<TGConnectingPoint num="17" id="2586" />
+<TGConnectingPoint num="18" id="2587" />
+<TGConnectingPoint num="19" id="2588" />
+<TGConnectingPoint num="20" id="2589" />
+<TGConnectingPoint num="21" id="2590" />
+<TGConnectingPoint num="22" id="2591" />
+<TGConnectingPoint num="23" id="2592" />
+<TGConnectingPoint num="24" id="2593" />
+<TGConnectingPoint num="25" id="2594" />
+<TGConnectingPoint num="26" id="2595" />
+<TGConnectingPoint num="27" id="2596" />
+<TGConnectingPoint num="28" id="2597" />
+<TGConnectingPoint num="29" id="2598" />
+<TGConnectingPoint num="30" id="2599" />
+<TGConnectingPoint num="31" id="2600" />
+<TGConnectingPoint num="32" id="2601" />
+<TGConnectingPoint num="33" id="2602" />
+<TGConnectingPoint num="34" id="2603" />
+<TGConnectingPoint num="35" id="2604" />
+<TGConnectingPoint num="36" id="2605" />
+<TGConnectingPoint num="37" id="2606" />
+<TGConnectingPoint num="38" id="2607" />
+<TGConnectingPoint num="39" id="2608" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3769" >
-<cdparam x="452" y="664" />
-<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2650" >
+<cdparam x="454" y="495" />
+<sizeparam width="152" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="Send signal" value="chin(msg)" />
-<TGConnectingPoint num="0" id="3759" />
-<TGConnectingPoint num="1" id="3760" />
-<TGConnectingPoint num="2" id="3761" />
-<TGConnectingPoint num="3" id="3762" />
-<TGConnectingPoint num="4" id="3763" />
-<TGConnectingPoint num="5" id="3764" />
-<TGConnectingPoint num="6" id="3765" />
-<TGConnectingPoint num="7" id="3766" />
-<TGConnectingPoint num="8" id="3767" />
-<TGConnectingPoint num="9" id="3768" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC_OK" />
+<TGConnectingPoint num="0" id="2610" />
+<TGConnectingPoint num="1" id="2611" />
+<TGConnectingPoint num="2" id="2612" />
+<TGConnectingPoint num="3" id="2613" />
+<TGConnectingPoint num="4" id="2614" />
+<TGConnectingPoint num="5" id="2615" />
+<TGConnectingPoint num="6" id="2616" />
+<TGConnectingPoint num="7" id="2617" />
+<TGConnectingPoint num="8" id="2618" />
+<TGConnectingPoint num="9" id="2619" />
+<TGConnectingPoint num="10" id="2620" />
+<TGConnectingPoint num="11" id="2621" />
+<TGConnectingPoint num="12" id="2622" />
+<TGConnectingPoint num="13" id="2623" />
+<TGConnectingPoint num="14" id="2624" />
+<TGConnectingPoint num="15" id="2625" />
+<TGConnectingPoint num="16" id="2626" />
+<TGConnectingPoint num="17" id="2627" />
+<TGConnectingPoint num="18" id="2628" />
+<TGConnectingPoint num="19" id="2629" />
+<TGConnectingPoint num="20" id="2630" />
+<TGConnectingPoint num="21" id="2631" />
+<TGConnectingPoint num="22" id="2632" />
+<TGConnectingPoint num="23" id="2633" />
+<TGConnectingPoint num="24" id="2634" />
+<TGConnectingPoint num="25" id="2635" />
+<TGConnectingPoint num="26" id="2636" />
+<TGConnectingPoint num="27" id="2637" />
+<TGConnectingPoint num="28" id="2638" />
+<TGConnectingPoint num="29" id="2639" />
+<TGConnectingPoint num="30" id="2640" />
+<TGConnectingPoint num="31" id="2641" />
+<TGConnectingPoint num="32" id="2642" />
+<TGConnectingPoint num="33" id="2643" />
+<TGConnectingPoint num="34" id="2644" />
+<TGConnectingPoint num="35" id="2645" />
+<TGConnectingPoint num="36" id="2646" />
+<TGConnectingPoint num="37" id="2647" />
+<TGConnectingPoint num="38" id="2648" />
+<TGConnectingPoint num="39" id="2649" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="3810" >
-<cdparam x="391" y="613" />
-<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2691" >
+<cdparam x="259" y="100" />
+<sizeparam width="166" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="WaitForACK" />
-<TGConnectingPoint num="0" id="3770" />
-<TGConnectingPoint num="1" id="3771" />
-<TGConnectingPoint num="2" id="3772" />
-<TGConnectingPoint num="3" id="3773" />
-<TGConnectingPoint num="4" id="3774" />
-<TGConnectingPoint num="5" id="3775" />
-<TGConnectingPoint num="6" id="3776" />
-<TGConnectingPoint num="7" id="3777" />
-<TGConnectingPoint num="8" id="3778" />
-<TGConnectingPoint num="9" id="3779" />
-<TGConnectingPoint num="10" id="3780" />
-<TGConnectingPoint num="11" id="3781" />
-<TGConnectingPoint num="12" id="3782" />
-<TGConnectingPoint num="13" id="3783" />
-<TGConnectingPoint num="14" id="3784" />
-<TGConnectingPoint num="15" id="3785" />
-<TGConnectingPoint num="16" id="3786" />
-<TGConnectingPoint num="17" id="3787" />
-<TGConnectingPoint num="18" id="3788" />
-<TGConnectingPoint num="19" id="3789" />
-<TGConnectingPoint num="20" id="3790" />
-<TGConnectingPoint num="21" id="3791" />
-<TGConnectingPoint num="22" id="3792" />
-<TGConnectingPoint num="23" id="3793" />
-<TGConnectingPoint num="24" id="3794" />
-<TGConnectingPoint num="25" id="3795" />
-<TGConnectingPoint num="26" id="3796" />
-<TGConnectingPoint num="27" id="3797" />
-<TGConnectingPoint num="28" id="3798" />
-<TGConnectingPoint num="29" id="3799" />
-<TGConnectingPoint num="30" id="3800" />
-<TGConnectingPoint num="31" id="3801" />
-<TGConnectingPoint num="32" id="3802" />
-<TGConnectingPoint num="33" id="3803" />
-<TGConnectingPoint num="34" id="3804" />
-<TGConnectingPoint num="35" id="3805" />
-<TGConnectingPoint num="36" id="3806" />
-<TGConnectingPoint num="37" id="3807" />
-<TGConnectingPoint num="38" id="3808" />
-<TGConnectingPoint num="39" id="3809" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="waitForKeyGroup" />
+<TGConnectingPoint num="0" id="2651" />
+<TGConnectingPoint num="1" id="2652" />
+<TGConnectingPoint num="2" id="2653" />
+<TGConnectingPoint num="3" id="2654" />
+<TGConnectingPoint num="4" id="2655" />
+<TGConnectingPoint num="5" id="2656" />
+<TGConnectingPoint num="6" id="2657" />
+<TGConnectingPoint num="7" id="2658" />
+<TGConnectingPoint num="8" id="2659" />
+<TGConnectingPoint num="9" id="2660" />
+<TGConnectingPoint num="10" id="2661" />
+<TGConnectingPoint num="11" id="2662" />
+<TGConnectingPoint num="12" id="2663" />
+<TGConnectingPoint num="13" id="2664" />
+<TGConnectingPoint num="14" id="2665" />
+<TGConnectingPoint num="15" id="2666" />
+<TGConnectingPoint num="16" id="2667" />
+<TGConnectingPoint num="17" id="2668" />
+<TGConnectingPoint num="18" id="2669" />
+<TGConnectingPoint num="19" id="2670" />
+<TGConnectingPoint num="20" id="2671" />
+<TGConnectingPoint num="21" id="2672" />
+<TGConnectingPoint num="22" id="2673" />
+<TGConnectingPoint num="23" id="2674" />
+<TGConnectingPoint num="24" id="2675" />
+<TGConnectingPoint num="25" id="2676" />
+<TGConnectingPoint num="26" id="2677" />
+<TGConnectingPoint num="27" id="2678" />
+<TGConnectingPoint num="28" id="2679" />
+<TGConnectingPoint num="29" id="2680" />
+<TGConnectingPoint num="30" id="2681" />
+<TGConnectingPoint num="31" id="2682" />
+<TGConnectingPoint num="32" id="2683" />
+<TGConnectingPoint num="33" id="2684" />
+<TGConnectingPoint num="34" id="2685" />
+<TGConnectingPoint num="35" id="2686" />
+<TGConnectingPoint num="36" id="2687" />
+<TGConnectingPoint num="37" id="2688" />
+<TGConnectingPoint num="38" id="2689" />
+<TGConnectingPoint num="39" id="2690" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="3821" >
-<cdparam x="453" y="538" />
+<COMPONENT type="5100" id="2693" >
+<cdparam x="335" y="52" />
+<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="1400" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2692" />
+</COMPONENT>
+
+<COMPONENT type="5104" id="2704" >
+<cdparam x="314" y="178" />
 <sizeparam width="73" 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="1900" />
-<infoparam name="Send signal" value="chout(msg)" />
-<TGConnectingPoint num="0" id="3811" />
-<TGConnectingPoint num="1" id="3812" />
-<TGConnectingPoint num="2" id="3813" />
-<TGConnectingPoint num="3" id="3814" />
-<TGConnectingPoint num="4" id="3815" />
-<TGConnectingPoint num="5" id="3816" />
-<TGConnectingPoint num="6" id="3817" />
-<TGConnectingPoint num="7" id="3818" />
-<TGConnectingPoint num="8" id="3819" />
-<TGConnectingPoint num="9" id="3820" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="2694" />
+<TGConnectingPoint num="1" id="2695" />
+<TGConnectingPoint num="2" id="2696" />
+<TGConnectingPoint num="3" id="2697" />
+<TGConnectingPoint num="4" id="2698" />
+<TGConnectingPoint num="5" id="2699" />
+<TGConnectingPoint num="6" id="2700" />
+<TGConnectingPoint num="7" id="2701" />
+<TGConnectingPoint num="8" id="2702" />
+<TGConnectingPoint num="9" id="2703" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3862" >
-<cdparam x="250" y="334" />
-<sizeparam width="133" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2715" >
+<cdparam x="512" y="767" />
+<sizeparam width="73" 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="1900" />
-<infoparam name="state0" value="TestMACFailed" />
-<TGConnectingPoint num="0" id="3822" />
-<TGConnectingPoint num="1" id="3823" />
-<TGConnectingPoint num="2" id="3824" />
-<TGConnectingPoint num="3" id="3825" />
-<TGConnectingPoint num="4" id="3826" />
-<TGConnectingPoint num="5" id="3827" />
-<TGConnectingPoint num="6" id="3828" />
-<TGConnectingPoint num="7" id="3829" />
-<TGConnectingPoint num="8" id="3830" />
-<TGConnectingPoint num="9" id="3831" />
-<TGConnectingPoint num="10" id="3832" />
-<TGConnectingPoint num="11" id="3833" />
-<TGConnectingPoint num="12" id="3834" />
-<TGConnectingPoint num="13" id="3835" />
-<TGConnectingPoint num="14" id="3836" />
-<TGConnectingPoint num="15" id="3837" />
-<TGConnectingPoint num="16" id="3838" />
-<TGConnectingPoint num="17" id="3839" />
-<TGConnectingPoint num="18" id="3840" />
-<TGConnectingPoint num="19" id="3841" />
-<TGConnectingPoint num="20" id="3842" />
-<TGConnectingPoint num="21" id="3843" />
-<TGConnectingPoint num="22" id="3844" />
-<TGConnectingPoint num="23" id="3845" />
-<TGConnectingPoint num="24" id="3846" />
-<TGConnectingPoint num="25" id="3847" />
-<TGConnectingPoint num="26" id="3848" />
-<TGConnectingPoint num="27" id="3849" />
-<TGConnectingPoint num="28" id="3850" />
-<TGConnectingPoint num="29" id="3851" />
-<TGConnectingPoint num="30" id="3852" />
-<TGConnectingPoint num="31" id="3853" />
-<TGConnectingPoint num="32" id="3854" />
-<TGConnectingPoint num="33" id="3855" />
-<TGConnectingPoint num="34" id="3856" />
-<TGConnectingPoint num="35" id="3857" />
-<TGConnectingPoint num="36" id="3858" />
-<TGConnectingPoint num="37" id="3859" />
-<TGConnectingPoint num="38" id="3860" />
-<TGConnectingPoint num="39" id="3861" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chin(msg)" />
+<TGConnectingPoint num="0" id="2705" />
+<TGConnectingPoint num="1" id="2706" />
+<TGConnectingPoint num="2" id="2707" />
+<TGConnectingPoint num="3" id="2708" />
+<TGConnectingPoint num="4" id="2709" />
+<TGConnectingPoint num="5" id="2710" />
+<TGConnectingPoint num="6" id="2711" />
+<TGConnectingPoint num="7" id="2712" />
+<TGConnectingPoint num="8" id="2713" />
+<TGConnectingPoint num="9" id="2714" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="3903" >
-<cdparam x="349" y="252" />
-<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2756" >
+<cdparam x="451" y="688" />
+<sizeparam width="195" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="state0" value="testMAC1" />
-<TGConnectingPoint num="0" id="3863" />
-<TGConnectingPoint num="1" id="3864" />
-<TGConnectingPoint num="2" id="3865" />
-<TGConnectingPoint num="3" id="3866" />
-<TGConnectingPoint num="4" id="3867" />
-<TGConnectingPoint num="5" id="3868" />
-<TGConnectingPoint num="6" id="3869" />
-<TGConnectingPoint num="7" id="3870" />
-<TGConnectingPoint num="8" id="3871" />
-<TGConnectingPoint num="9" id="3872" />
-<TGConnectingPoint num="10" id="3873" />
-<TGConnectingPoint num="11" id="3874" />
-<TGConnectingPoint num="12" id="3875" />
-<TGConnectingPoint num="13" id="3876" />
-<TGConnectingPoint num="14" id="3877" />
-<TGConnectingPoint num="15" id="3878" />
-<TGConnectingPoint num="16" id="3879" />
-<TGConnectingPoint num="17" id="3880" />
-<TGConnectingPoint num="18" id="3881" />
-<TGConnectingPoint num="19" id="3882" />
-<TGConnectingPoint num="20" id="3883" />
-<TGConnectingPoint num="21" id="3884" />
-<TGConnectingPoint num="22" id="3885" />
-<TGConnectingPoint num="23" id="3886" />
-<TGConnectingPoint num="24" id="3887" />
-<TGConnectingPoint num="25" id="3888" />
-<TGConnectingPoint num="26" id="3889" />
-<TGConnectingPoint num="27" id="3890" />
-<TGConnectingPoint num="28" id="3891" />
-<TGConnectingPoint num="29" id="3892" />
-<TGConnectingPoint num="30" id="3893" />
-<TGConnectingPoint num="31" id="3894" />
-<TGConnectingPoint num="32" id="3895" />
-<TGConnectingPoint num="33" id="3896" />
-<TGConnectingPoint num="34" id="3897" />
-<TGConnectingPoint num="35" id="3898" />
-<TGConnectingPoint num="36" id="3899" />
-<TGConnectingPoint num="37" id="3900" />
-<TGConnectingPoint num="38" id="3901" />
-<TGConnectingPoint num="39" id="3902" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="WaitForData" />
+<TGConnectingPoint num="0" id="2716" />
+<TGConnectingPoint num="1" id="2717" />
+<TGConnectingPoint num="2" id="2718" />
+<TGConnectingPoint num="3" id="2719" />
+<TGConnectingPoint num="4" id="2720" />
+<TGConnectingPoint num="5" id="2721" />
+<TGConnectingPoint num="6" id="2722" />
+<TGConnectingPoint num="7" id="2723" />
+<TGConnectingPoint num="8" id="2724" />
+<TGConnectingPoint num="9" id="2725" />
+<TGConnectingPoint num="10" id="2726" />
+<TGConnectingPoint num="11" id="2727" />
+<TGConnectingPoint num="12" id="2728" />
+<TGConnectingPoint num="13" id="2729" />
+<TGConnectingPoint num="14" id="2730" />
+<TGConnectingPoint num="15" id="2731" />
+<TGConnectingPoint num="16" id="2732" />
+<TGConnectingPoint num="17" id="2733" />
+<TGConnectingPoint num="18" id="2734" />
+<TGConnectingPoint num="19" id="2735" />
+<TGConnectingPoint num="20" id="2736" />
+<TGConnectingPoint num="21" id="2737" />
+<TGConnectingPoint num="22" id="2738" />
+<TGConnectingPoint num="23" id="2739" />
+<TGConnectingPoint num="24" id="2740" />
+<TGConnectingPoint num="25" id="2741" />
+<TGConnectingPoint num="26" id="2742" />
+<TGConnectingPoint num="27" id="2743" />
+<TGConnectingPoint num="28" id="2744" />
+<TGConnectingPoint num="29" id="2745" />
+<TGConnectingPoint num="30" id="2746" />
+<TGConnectingPoint num="31" id="2747" />
+<TGConnectingPoint num="32" id="2748" />
+<TGConnectingPoint num="33" id="2749" />
+<TGConnectingPoint num="34" id="2750" />
+<TGConnectingPoint num="35" id="2751" />
+<TGConnectingPoint num="36" id="2752" />
+<TGConnectingPoint num="37" id="2753" />
+<TGConnectingPoint num="38" id="2754" />
+<TGConnectingPoint num="39" id="2755" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="3914" >
-<cdparam x="358" y="142" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2767" >
+<cdparam x="507" y="628" />
+<sizeparam width="73" 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="1900" />
-<infoparam name="Send signal" value="chin(msg8)" />
-<TGConnectingPoint num="0" id="3904" />
-<TGConnectingPoint num="1" id="3905" />
-<TGConnectingPoint num="2" id="3906" />
-<TGConnectingPoint num="3" id="3907" />
-<TGConnectingPoint num="4" id="3908" />
-<TGConnectingPoint num="5" id="3909" />
-<TGConnectingPoint num="6" id="3910" />
-<TGConnectingPoint num="7" id="3911" />
-<TGConnectingPoint num="8" id="3912" />
-<TGConnectingPoint num="9" id="3913" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="Send signal" value="chout(msg)" />
+<TGConnectingPoint num="0" id="2757" />
+<TGConnectingPoint num="1" id="2758" />
+<TGConnectingPoint num="2" id="2759" />
+<TGConnectingPoint num="3" id="2760" />
+<TGConnectingPoint num="4" id="2761" />
+<TGConnectingPoint num="5" id="2762" />
+<TGConnectingPoint num="6" id="2763" />
+<TGConnectingPoint num="7" id="2764" />
+<TGConnectingPoint num="8" id="2765" />
+<TGConnectingPoint num="9" id="2766" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="3916" >
-<cdparam x="391" y="104" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2808" >
+<cdparam x="405" y="405" />
+<sizeparam width="99" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="3915" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
+<infoparam name="state0" value="testMAC1" />
+<TGConnectingPoint num="0" id="2768" />
+<TGConnectingPoint num="1" id="2769" />
+<TGConnectingPoint num="2" id="2770" />
+<TGConnectingPoint num="3" id="2771" />
+<TGConnectingPoint num="4" id="2772" />
+<TGConnectingPoint num="5" id="2773" />
+<TGConnectingPoint num="6" id="2774" />
+<TGConnectingPoint num="7" id="2775" />
+<TGConnectingPoint num="8" id="2776" />
+<TGConnectingPoint num="9" id="2777" />
+<TGConnectingPoint num="10" id="2778" />
+<TGConnectingPoint num="11" id="2779" />
+<TGConnectingPoint num="12" id="2780" />
+<TGConnectingPoint num="13" id="2781" />
+<TGConnectingPoint num="14" id="2782" />
+<TGConnectingPoint num="15" id="2783" />
+<TGConnectingPoint num="16" id="2784" />
+<TGConnectingPoint num="17" id="2785" />
+<TGConnectingPoint num="18" id="2786" />
+<TGConnectingPoint num="19" id="2787" />
+<TGConnectingPoint num="20" id="2788" />
+<TGConnectingPoint num="21" id="2789" />
+<TGConnectingPoint num="22" id="2790" />
+<TGConnectingPoint num="23" id="2791" />
+<TGConnectingPoint num="24" id="2792" />
+<TGConnectingPoint num="25" id="2793" />
+<TGConnectingPoint num="26" id="2794" />
+<TGConnectingPoint num="27" id="2795" />
+<TGConnectingPoint num="28" id="2796" />
+<TGConnectingPoint num="29" id="2797" />
+<TGConnectingPoint num="30" id="2798" />
+<TGConnectingPoint num="31" id="2799" />
+<TGConnectingPoint num="32" id="2800" />
+<TGConnectingPoint num="33" id="2801" />
+<TGConnectingPoint num="34" id="2802" />
+<TGConnectingPoint num="35" id="2803" />
+<TGConnectingPoint num="36" id="2804" />
+<TGConnectingPoint num="37" id="2805" />
+<TGConnectingPoint num="38" id="2806" />
+<TGConnectingPoint num="39" id="2807" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
 
@@ -7534,53 +6974,51 @@ all subblocks
 <TGConnectingPoint num="23" id="4049" />
 <extraparam>
 <CryptoBlock value="false" />
-<Signal value="in chin(Message msg)" />
-<Signal value="out chout(Message msg)" />
+<Signal value="in chin(Message msg)" attached="false" />
+<Signal value="out chout(Message msg)" attached="false" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="4000" >
+<SUBCOMPONENT type="5000" id="4025" >
 <father id="4050" num="0" />
-<cdparam x="76" y="243" />
-<sizeparam width="338" height="297" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="427" y="245" />
+<sizeparam width="290" height="289" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="430" minY="0" maxY="81" />
-<infoparam name="Block0" value="ECU1" />
-<TGConnectingPoint num="0" id="3976" />
-<TGConnectingPoint num="1" id="3977" />
-<TGConnectingPoint num="2" id="3978" />
-<TGConnectingPoint num="3" id="3979" />
-<TGConnectingPoint num="4" id="3980" />
-<TGConnectingPoint num="5" id="3981" />
-<TGConnectingPoint num="6" id="3982" />
-<TGConnectingPoint num="7" id="3983" />
-<TGConnectingPoint num="8" id="3984" />
-<TGConnectingPoint num="9" id="3985" />
-<TGConnectingPoint num="10" id="3986" />
-<TGConnectingPoint num="11" id="3987" />
-<TGConnectingPoint num="12" id="3988" />
-<TGConnectingPoint num="13" id="3989" />
-<TGConnectingPoint num="14" id="3990" />
-<TGConnectingPoint num="15" id="3991" />
-<TGConnectingPoint num="16" id="3992" />
-<TGConnectingPoint num="17" id="3993" />
-<TGConnectingPoint num="18" id="3994" />
-<TGConnectingPoint num="19" id="3995" />
-<TGConnectingPoint num="20" id="3996" />
-<TGConnectingPoint num="21" id="3997" />
-<TGConnectingPoint num="22" id="3998" />
-<TGConnectingPoint num="23" id="3999" />
+<cdrectangleparam minX="0" maxX="478" minY="0" maxY="89" />
+<infoparam name="Block0" value="ECU2" />
+<TGConnectingPoint num="0" id="4001" />
+<TGConnectingPoint num="1" id="4002" />
+<TGConnectingPoint num="2" id="4003" />
+<TGConnectingPoint num="3" id="4004" />
+<TGConnectingPoint num="4" id="4005" />
+<TGConnectingPoint num="5" id="4006" />
+<TGConnectingPoint num="6" id="4007" />
+<TGConnectingPoint num="7" id="4008" />
+<TGConnectingPoint num="8" id="4009" />
+<TGConnectingPoint num="9" id="4010" />
+<TGConnectingPoint num="10" id="4011" />
+<TGConnectingPoint num="11" id="4012" />
+<TGConnectingPoint num="12" id="4013" />
+<TGConnectingPoint num="13" id="4014" />
+<TGConnectingPoint num="14" id="4015" />
+<TGConnectingPoint num="15" id="4016" />
+<TGConnectingPoint num="16" id="4017" />
+<TGConnectingPoint num="17" id="4018" />
+<TGConnectingPoint num="18" id="4019" />
+<TGConnectingPoint num="19" id="4020" />
+<TGConnectingPoint num="20" id="4021" />
+<TGConnectingPoint num="21" id="4022" />
+<TGConnectingPoint num="22" id="4023" />
+<TGConnectingPoint num="23" id="4024" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="ack" value="1" type="8" typeOther="" />
 <Attribute access="0" id="rpk" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu1id" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu2id" value="" type="8" typeOther="" />
 <Attribute access="0" id="mvksk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="mvkpk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk1sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk1pk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
+<Attribute access="0" id="idk2sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk2pk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="ts0" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts1" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts2" value="" type="8" typeOther="" />
@@ -7588,7 +7026,9 @@ all subblocks
 <Attribute access="0" id="ts4" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts5" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts6" value="" type="8" typeOther="" />
-<Attribute access="0" id="idk2Pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1Pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="sesk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="sd" value="" type="8" typeOther="" />
 <Attribute access="0" id="m0" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
@@ -7621,49 +7061,52 @@ all subblocks
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Key DH(Key pubK, Key privK)" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="4025" >
+<SUBCOMPONENT type="5000" id="4000" >
 <father id="4050" num="1" />
-<cdparam x="427" y="245" />
-<sizeparam width="290" height="289" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="76" y="243" />
+<sizeparam width="338" height="297" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="478" minY="0" maxY="89" />
-<infoparam name="Block0" value="ECU2" />
-<TGConnectingPoint num="0" id="4001" />
-<TGConnectingPoint num="1" id="4002" />
-<TGConnectingPoint num="2" id="4003" />
-<TGConnectingPoint num="3" id="4004" />
-<TGConnectingPoint num="4" id="4005" />
-<TGConnectingPoint num="5" id="4006" />
-<TGConnectingPoint num="6" id="4007" />
-<TGConnectingPoint num="7" id="4008" />
-<TGConnectingPoint num="8" id="4009" />
-<TGConnectingPoint num="9" id="4010" />
-<TGConnectingPoint num="10" id="4011" />
-<TGConnectingPoint num="11" id="4012" />
-<TGConnectingPoint num="12" id="4013" />
-<TGConnectingPoint num="13" id="4014" />
-<TGConnectingPoint num="14" id="4015" />
-<TGConnectingPoint num="15" id="4016" />
-<TGConnectingPoint num="16" id="4017" />
-<TGConnectingPoint num="17" id="4018" />
-<TGConnectingPoint num="18" id="4019" />
-<TGConnectingPoint num="19" id="4020" />
-<TGConnectingPoint num="20" id="4021" />
-<TGConnectingPoint num="21" id="4022" />
-<TGConnectingPoint num="22" id="4023" />
-<TGConnectingPoint num="23" id="4024" />
+<cdrectangleparam minX="0" maxX="430" minY="0" maxY="81" />
+<infoparam name="Block0" value="ECU1" />
+<TGConnectingPoint num="0" id="3976" />
+<TGConnectingPoint num="1" id="3977" />
+<TGConnectingPoint num="2" id="3978" />
+<TGConnectingPoint num="3" id="3979" />
+<TGConnectingPoint num="4" id="3980" />
+<TGConnectingPoint num="5" id="3981" />
+<TGConnectingPoint num="6" id="3982" />
+<TGConnectingPoint num="7" id="3983" />
+<TGConnectingPoint num="8" id="3984" />
+<TGConnectingPoint num="9" id="3985" />
+<TGConnectingPoint num="10" id="3986" />
+<TGConnectingPoint num="11" id="3987" />
+<TGConnectingPoint num="12" id="3988" />
+<TGConnectingPoint num="13" id="3989" />
+<TGConnectingPoint num="14" id="3990" />
+<TGConnectingPoint num="15" id="3991" />
+<TGConnectingPoint num="16" id="3992" />
+<TGConnectingPoint num="17" id="3993" />
+<TGConnectingPoint num="18" id="3994" />
+<TGConnectingPoint num="19" id="3995" />
+<TGConnectingPoint num="20" id="3996" />
+<TGConnectingPoint num="21" id="3997" />
+<TGConnectingPoint num="22" id="3998" />
+<TGConnectingPoint num="23" id="3999" />
 <extraparam>
-<CryptoBlock value="false" />
+<CryptoBlock value="true" />
 <Attribute access="0" id="ack" value="1" type="8" typeOther="" />
 <Attribute access="0" id="rpk" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu1id" value="" type="8" typeOther="" />
 <Attribute access="0" id="ecu2id" value="" type="8" typeOther="" />
 <Attribute access="0" id="mvksk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="mvkpk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk2sk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="idk2pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1sk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="idk1pk" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="SesK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="secretData" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts0" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts1" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts2" value="" type="8" typeOther="" />
@@ -7671,9 +7114,7 @@ all subblocks
 <Attribute access="0" id="ts4" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts5" value="" type="8" typeOther="" />
 <Attribute access="0" id="ts6" value="" type="8" typeOther="" />
-<Attribute access="0" id="idk1Pk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="sesk" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="sd" value="" type="8" typeOther="" />
+<Attribute access="0" id="idk2Pk" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="m0" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m1" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="m2" value="" type="5" typeOther="Message" />
@@ -7706,6 +7147,7 @@ all subblocks
 <Method value="get2(Message msg, Message msg1, Message msg2)" />
 <Method value="get3(Message msg, Message msg1, Message msg2, Message msg3)" />
 <Method value="get4(Message msg, Message msg1, Message msg2, Message msg3, Message msg4)" />
+<Method value="Key DH(Key pubK, Key privK)" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -7725,130 +7167,116 @@ all subblocks
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECU2" minX="10" maxX="1400" minY="10" maxY="2900" >
-<CONNECTOR type="118" id="4053" >
-<cdparam x="692" y="1924" />
+<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="2900" >
+<CONNECTOR type="118" id="5807" >
+<cdparam x="741" y="2090" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="692" y="1924" id="4643" />
-<P2  x="590" y="1936" id="4693" />
+<P1  x="741" y="2090" id="6374" />
+<P2  x="630" y="2102" id="6424" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4054" >
-<cdparam x="556" y="1263" />
+<CONNECTOR type="118" id="5808" >
+<cdparam x="729" y="1796" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="556" y="1263" id="4969" />
-<P2  x="475" y="1272" id="5019" />
+<P1  x="729" y="1796" id="6484" />
+<P2  x="643" y="1806" id="6534" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4061" >
-<cdparam x="434" y="1028" />
+<CONNECTOR type="118" id="5809" >
+<cdparam x="557" y="1335" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4060" />
-<P1  x="434" y="1028" id="5133" />
-<P2  x="429" y="1137" id="5036" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4059" >
-<father id="4061" num="0" />
-<cdparam x="436" y="1050" />
-<sizeparam width="168" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4055" />
-<TGConnectingPoint num="1" id="4056" />
-<TGConnectingPoint num="2" id="4057" />
-<TGConnectingPoint num="3" id="4058" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="tmp1 = sign(idk2pk,mvksk)" />
-<actions value="tmp2 = cert(idk2pk,tmp1)" />
-<actions value="tmp3.data = ts2" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk2sk)" />
-<actions value="m2 = concat2(tmp4,tmp5)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="118" id="4062" >
-<cdparam x="546" y="1000" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="557" y="1335" id="6799" />
+<P2  x="449" y="1349" id="6849" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<CONNECTOR type="118" id="5810" >
+<cdparam x="526" y="1036" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="546" y="1000" id="5079" />
-<P2  x="484" y="1003" id="5163" />
+<P1  x="526" y="1036" id="6909" />
+<P2  x="438" y="1044" id="6959" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4063" >
-<cdparam x="453" y="572" />
+<CONNECTOR type="118" id="5811" >
+<cdparam x="266" y="570" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state1" value="null" />
-<P1  x="453" y="572" id="5096" />
-<P2  x="360" y="584" id="5502" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="266" y="570" id="7172" />
+<P2  x="127" y="575" id="7308" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="4064" >
-<cdparam x="231" y="83" />
+<CONNECTOR type="118" id="5812" >
+<cdparam x="334" y="333" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from UML Note to state0" value="null" />
+<P1  x="277" y="335" id="7189" />
+<P2  x="154" y="346" id="7412" />
+<AutomaticDrawing  data="false" />
+</CONNECTOR>
+<CONNECTOR type="118" id="5813" >
+<cdparam x="175" y="86" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to UML Note" value="null" />
-<P1  x="231" y="83" id="5800" />
-<P2  x="272" y="83" id="5113" />
+<P1  x="137" y="90" id="7494" />
+<P2  x="278" y="76" id="7206" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="4071" >
-<cdparam x="277" y="445" />
+<CONNECTOR type="5102" id="5820" >
+<cdparam x="428" y="180" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4070" />
-<P1  x="302" y="434" id="5387" />
-<P2  x="302" y="479" id="5566" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5819" />
+<P1  x="88" y="115" id="7464" />
+<P2  x="103" y="205" id="7418" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4069" >
-<father id="4071" num="0" />
-<cdparam x="314" y="453" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5818" >
+<father id="5820" num="0" />
+<cdparam x="123" y="126" />
+<sizeparam width="213" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4065" />
-<TGConnectingPoint num="1" id="4066" />
-<TGConnectingPoint num="2" id="4067" />
-<TGConnectingPoint num="3" id="4068" />
+<TGConnectingPoint num="0" id="5814" />
+<TGConnectingPoint num="1" id="5815" />
+<TGConnectingPoint num="2" id="5816" />
+<TGConnectingPoint num="3" id="5817" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="idk1Pk = getpk(tmp2)" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
+<actions value="tmp1 = sign(idk1pk, mvksk)" />
+<actions value="tmp2 = cert(idk1pk, tmp1)" />
+<actions value="tmp3.data = ts0" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m0 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4078" >
-<cdparam x="447" y="71" />
+<CONNECTOR type="5102" id="5827" >
+<cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="4077" />
-<P1  x="140" y="45" id="5805" />
-<P2  x="140" y="58" id="5765" />
+<TGConnectingPoint num="0" id="5826" />
+<P1  x="74" y="47" id="7499" />
+<P2  x="75" y="65" id="7475" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4076" >
-<father id="4078" num="0" />
-<cdparam x="447" y="111" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5825" >
+<father id="5827" num="0" />
+<cdparam x="407" y="110" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4072" />
-<TGConnectingPoint num="1" id="4073" />
-<TGConnectingPoint num="2" id="4074" />
-<TGConnectingPoint num="3" id="4075" />
+<TGConnectingPoint num="0" id="5821" />
+<TGConnectingPoint num="1" id="5822" />
+<TGConnectingPoint num="2" id="5823" />
+<TGConnectingPoint num="3" id="5824" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7858,25 +7286,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4085" >
-<cdparam x="447" y="158" />
+<CONNECTOR type="5102" id="5834" >
+<cdparam x="451" y="341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4084" />
-<P1  x="140" y="108" id="5770" />
-<P2  x="140" y="121" id="5753" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="5833" />
+<P1  x="116" y="255" id="7447" />
+<P2  x="137" y="272" id="7365" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4083" >
-<father id="4085" num="0" />
-<cdparam x="447" y="198" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5832" >
+<father id="5834" num="0" />
+<cdparam x="451" y="381" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4079" />
-<TGConnectingPoint num="1" id="4080" />
-<TGConnectingPoint num="2" id="4081" />
-<TGConnectingPoint num="3" id="4082" />
+<TGConnectingPoint num="0" id="5828" />
+<TGConnectingPoint num="1" id="5829" />
+<TGConnectingPoint num="2" id="5830" />
+<TGConnectingPoint num="3" id="5831" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -7886,114 +7314,117 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4092" >
-<cdparam x="451" y="236" />
+<CONNECTOR type="5102" id="5841" >
+<cdparam x="445" y="417" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4091" />
-<P1  x="140" y="151" id="5754" />
-<P2  x="140" y="183" id="5713" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4090" >
-<father id="4092" num="0" />
-<cdparam x="187" y="157" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5840" />
+<P1  x="137" y="302" id="7366" />
+<P2  x="119" y="321" id="7394" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5839" >
+<father id="5841" num="0" />
+<cdparam x="445" y="457" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4086" />
-<TGConnectingPoint num="1" id="4087" />
-<TGConnectingPoint num="2" id="4088" />
-<TGConnectingPoint num="3" id="4089" />
+<TGConnectingPoint num="0" id="5835" />
+<TGConnectingPoint num="1" id="5836" />
+<TGConnectingPoint num="2" id="5837" />
+<TGConnectingPoint num="3" id="5838" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m0, tmp4, tmp5)" />
-<actions value="get2(tmp4, tmp2, tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4099" >
-<cdparam x="95" y="304" />
+<CONNECTOR type="5102" id="5848" >
+<cdparam x="146" y="365" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4098" />
-<P1  x="94" y="233" id="5726" />
-<P2  x="95" y="314" id="5689" />
+<TGConnectingPoint num="0" id="5847" />
+<P1  x="119" y="371" id="7406" />
+<P2  x="85" y="436" id="7325" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4097" >
-<father id="4099" num="0" />
-<cdparam x="25" y="274" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5846" >
+<father id="5848" num="0" />
+<cdparam x="141" y="390" />
+<sizeparam width="203" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4093" />
-<TGConnectingPoint num="1" id="4094" />
-<TGConnectingPoint num="2" id="4095" />
-<TGConnectingPoint num="3" id="4096" />
+<TGConnectingPoint num="0" id="5842" />
+<TGConnectingPoint num="1" id="5843" />
+<TGConnectingPoint num="2" id="5844" />
+<TGConnectingPoint num="3" id="5845" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts0) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = rpk" />
+<actions value="tmp2.data = ecu2id" />
+<actions value="tmp3.data = ts1" />
+<actions value="tmp4 = concat3(tmp1,tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m1 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4106" >
-<cdparam x="232" y="304" />
+<CONNECTOR type="5102" id="5855" >
+<cdparam x="97" y="486" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state1" value="null" />
-<TGConnectingPoint num="0" id="4105" />
-<P1  x="231" y="233" id="5719" />
-<P2  x="253" y="288" id="5638" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="5854" />
+<P1  x="97" y="486" id="7354" />
+<P2  x="91" y="503" id="7313" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4104" >
-<father id="4106" num="0" />
-<cdparam x="246" y="255" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5853" >
+<father id="5855" num="0" />
+<cdparam x="97" y="526" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4100" />
-<TGConnectingPoint num="1" id="4101" />
-<TGConnectingPoint num="2" id="4102" />
-<TGConnectingPoint num="3" id="4103" />
+<TGConnectingPoint num="0" id="5849" />
+<TGConnectingPoint num="1" id="5850" />
+<TGConnectingPoint num="2" id="5851" />
+<TGConnectingPoint num="3" id="5852" />
 <extraparam>
-<guard value="[ tmp3.data == ts0 ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4113" >
-<cdparam x="231" y="423" />
+<CONNECTOR type="5102" id="5862" >
+<cdparam x="91" y="533" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4112" />
-<P1  x="240" y="338" id="5658" />
-<P2  x="184" y="395" id="5607" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5861" />
+<P1  x="91" y="533" id="7314" />
+<P2  x="52" y="550" id="7280" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4111" >
-<father id="4113" num="0" />
-<cdparam x="146" y="380" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5860" >
+<father id="5862" num="0" />
+<cdparam x="91" y="573" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4107" />
-<TGConnectingPoint num="1" id="4108" />
-<TGConnectingPoint num="2" id="4109" />
-<TGConnectingPoint num="3" id="4110" />
+<TGConnectingPoint num="0" id="5856" />
+<TGConnectingPoint num="1" id="5857" />
+<TGConnectingPoint num="2" id="5858" />
+<TGConnectingPoint num="3" id="5859" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8001,27 +7432,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4120" >
-<cdparam x="331" y="423" />
+<CONNECTOR type="5102" id="5869" >
+<cdparam x="89" y="600" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4119" />
-<P1  x="290" y="338" id="5660" />
-<P2  x="302" y="384" id="5381" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="5868" />
+<P1  x="89" y="600" id="7302" />
+<P2  x="83" y="616" id="7261" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4118" >
-<father id="4120" num="0" />
-<cdparam x="306" y="367" />
-<sizeparam width="167" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5867" >
+<father id="5869" num="0" />
+<cdparam x="89" y="640" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4114" />
-<TGConnectingPoint num="1" id="4115" />
-<TGConnectingPoint num="2" id="4116" />
-<TGConnectingPoint num="3" id="4117" />
+<TGConnectingPoint num="0" id="5863" />
+<TGConnectingPoint num="1" id="5864" />
+<TGConnectingPoint num="2" id="5865" />
+<TGConnectingPoint num="3" id="5866" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8029,55 +7460,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4127" >
-<cdparam x="243" y="476" />
+<CONNECTOR type="5102" id="5876" >
+<cdparam x="83" y="646" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4126" />
-<P1  x="240" y="529" id="5553" />
-<P2  x="118" y="560" id="5509" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5875" />
+<P1  x="83" y="646" id="7262" />
+<P2  x="124" y="699" id="7236" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4125" >
-<father id="4127" num="0" />
-<cdparam x="96" y="536" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5874" >
+<father id="5876" num="0" />
+<cdparam x="114" y="662" />
+<sizeparam width="135" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4121" />
-<TGConnectingPoint num="1" id="4122" />
-<TGConnectingPoint num="2" id="4123" />
-<TGConnectingPoint num="3" id="4124" />
+<TGConnectingPoint num="0" id="5870" />
+<TGConnectingPoint num="1" id="5871" />
+<TGConnectingPoint num="2" id="5872" />
+<TGConnectingPoint num="3" id="5873" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m2,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4134" >
-<cdparam x="343" y="476" />
+<CONNECTOR type="5102" id="5883" >
+<cdparam x="112" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state1" value="null" />
-<TGConnectingPoint num="0" id="4133" />
-<P1  x="315" y="529" id="5563" />
-<P2  x="271" y="559" id="5474" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5882" />
+<P1  x="112" y="749" id="7225" />
+<P2  x="89" y="809" id="7146" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4132" >
-<father id="4134" num="0" />
-<cdparam x="270" y="544" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5881" >
+<father id="5883" num="0" />
+<cdparam x="12" y="775" />
+<sizeparam width="145" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4128" />
-<TGConnectingPoint num="1" id="4129" />
-<TGConnectingPoint num="2" id="4130" />
-<TGConnectingPoint num="3" id="4131" />
+<TGConnectingPoint num="0" id="5877" />
+<TGConnectingPoint num="1" id="5878" />
+<TGConnectingPoint num="2" id="5879" />
+<TGConnectingPoint num="3" id="5880" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(tmp3.data == ts2)]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8085,142 +7518,142 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4141" >
-<cdparam x="317" y="568" />
+<CONNECTOR type="5102" id="5890" >
+<cdparam x="212" y="749" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4140" />
-<P1  x="315" y="609" id="5496" />
-<P2  x="250" y="624" id="5455" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5889" />
+<P1  x="212" y="749" id="7227" />
+<P2  x="198" y="809" id="7087" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4139" >
-<father id="4141" num="0" />
-<cdparam x="303" y="638" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5888" >
+<father id="5890" num="0" />
+<cdparam x="212" y="777" />
+<sizeparam width="163" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4135" />
-<TGConnectingPoint num="1" id="4136" />
-<TGConnectingPoint num="2" id="4137" />
-<TGConnectingPoint num="3" id="4138" />
+<TGConnectingPoint num="0" id="5884" />
+<TGConnectingPoint num="1" id="5885" />
+<TGConnectingPoint num="2" id="5886" />
+<TGConnectingPoint num="3" id="5887" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp3.data == ts2 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4148" >
-<cdparam x="313" y="621" />
+<CONNECTOR type="5102" id="5897" >
+<cdparam x="198" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state1" value="null" />
-<TGConnectingPoint num="0" id="4147" />
-<P1  x="250" y="654" id="5456" />
-<P2  x="201" y="687" id="5430" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5896" />
+<P1  x="198" y="859" id="7092" />
+<P2  x="149" y="914" id="7047" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4146" >
-<father id="4148" num="0" />
-<cdparam x="271" y="666" />
-<sizeparam width="170" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5895" >
+<father id="5897" num="0" />
+<cdparam x="111" y="886" />
+<sizeparam width="50" 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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4142" />
-<TGConnectingPoint num="1" id="4143" />
-<TGConnectingPoint num="2" id="4144" />
-<TGConnectingPoint num="3" id="4145" />
+<TGConnectingPoint num="0" id="5891" />
+<TGConnectingPoint num="1" id="5892" />
+<TGConnectingPoint num="2" id="5893" />
+<TGConnectingPoint num="3" id="5894" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m1,tmp4,tmp5)" />
-<actions value="get3(tmp4,tmp1,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4155" >
-<cdparam x="189" y="737" />
+<CONNECTOR type="5102" id="5904" >
+<cdparam x="298" y="859" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4154" />
-<P1  x="201" y="737" id="5442" />
-<P2  x="163" y="778" id="5334" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5903" />
+<P1  x="298" y="859" id="7094" />
+<P2  x="290" y="914" id="7021" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4153" >
-<father id="4155" num="0" />
-<cdparam x="34" y="748" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5902" >
+<father id="5904" num="0" />
+<cdparam x="303" y="873" />
+<sizeparam width="198" height="45" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4149" />
-<TGConnectingPoint num="1" id="4150" />
-<TGConnectingPoint num="2" id="4151" />
-<TGConnectingPoint num="3" id="4152" />
+<TGConnectingPoint num="0" id="5898" />
+<TGConnectingPoint num="1" id="5899" />
+<TGConnectingPoint num="2" id="5900" />
+<TGConnectingPoint num="3" id="5901" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts1) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="idk2Pk = getpk(tmp2)" />
+<actions value="b = verifySign(tmp4,tmp5,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4162" >
-<cdparam x="289" y="737" />
+<CONNECTOR type="5102" id="5911" >
+<cdparam x="199" y="964" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state1 to state0" value="null" />
-<TGConnectingPoint num="0" id="4161" />
-<P1  x="264" y="737" id="5429" />
-<P2  x="292" y="778" id="5299" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5910" />
+<P1  x="278" y="964" id="7010" />
+<P2  x="185" y="1019" id="6972" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4160" >
-<father id="4162" num="0" />
-<cdparam x="288" y="752" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5909" >
+<father id="5911" num="0" />
+<cdparam x="169" y="993" />
+<sizeparam width="50" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4156" />
-<TGConnectingPoint num="1" id="4157" />
-<TGConnectingPoint num="2" id="4158" />
-<TGConnectingPoint num="3" id="4159" />
+<TGConnectingPoint num="0" id="5905" />
+<TGConnectingPoint num="1" id="5906" />
+<TGConnectingPoint num="2" id="5907" />
+<TGConnectingPoint num="3" id="5908" />
 <extraparam>
-<guard value="[ tmp3.data == ts1 ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4169" >
-<cdparam x="267" y="828" />
+<CONNECTOR type="5102" id="5918" >
+<cdparam x="378" y="964" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4168" />
-<P1  x="279" y="828" id="5319" />
-<P2  x="249" y="877" id="5252" />
+<TGConnectingPoint num="0" id="5917" />
+<P1  x="378" y="964" id="7012" />
+<P2  x="388" y="1019" id="6924" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4167" >
-<father id="4169" num="0" />
-<cdparam x="187" y="850" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5916" >
+<father id="5918" num="0" />
+<cdparam x="388" y="985" />
+<sizeparam width="24" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4163" />
-<TGConnectingPoint num="1" id="4164" />
-<TGConnectingPoint num="2" id="4165" />
-<TGConnectingPoint num="3" id="4166" />
+<TGConnectingPoint num="0" id="5912" />
+<TGConnectingPoint num="1" id="5913" />
+<TGConnectingPoint num="2" id="5914" />
+<TGConnectingPoint num="3" id="5915" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8228,55 +7661,61 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4176" >
-<cdparam x="367" y="828" />
+<CONNECTOR type="5102" id="5925" >
+<cdparam x="425" y="1069" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4175" />
-<P1  x="342" y="828" id="5306" />
-<P2  x="354" y="880" id="5217" />
+<TGConnectingPoint num="0" id="5924" />
+<P1  x="388" y="1069" id="6929" />
+<P2  x="385" y="1185" id="6866" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4174" >
-<father id="4176" num="0" />
-<cdparam x="368" y="850" />
-<sizeparam width="198" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5923" >
+<father id="5925" num="0" />
+<cdparam x="402" y="1087" />
+<sizeparam width="199" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4170" />
-<TGConnectingPoint num="1" id="4171" />
-<TGConnectingPoint num="2" id="4172" />
-<TGConnectingPoint num="3" id="4173" />
+<TGConnectingPoint num="0" id="5919" />
+<TGConnectingPoint num="1" id="5920" />
+<TGConnectingPoint num="2" id="5921" />
+<TGConnectingPoint num="3" id="5922" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = SesK.data" />
+<actions value="tmp2 = aencrypt(tmp1,idk2Pk)" />
+<actions value="tmp3.data = ts3" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk1sk)" />
+<actions value="m3 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4183" >
-<cdparam x="329" y="930" />
+<CONNECTOR type="5102" id="5932" >
+<cdparam x="397" y="1235" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4182" />
-<P1  x="341" y="930" id="5237" />
-<P2  x="290" y="980" id="5187" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="5931" />
+<P1  x="397" y="1235" id="6895" />
+<P2  x="392" y="1257" id="6854" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4181" >
-<father id="4183" num="0" />
-<cdparam x="159" y="957" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5930" >
+<father id="5932" num="0" />
+<cdparam x="397" y="1275" />
+<sizeparam width="10" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4177" />
-<TGConnectingPoint num="1" id="4178" />
-<TGConnectingPoint num="2" id="4179" />
-<TGConnectingPoint num="3" id="4180" />
+<TGConnectingPoint num="0" id="5926" />
+<TGConnectingPoint num="1" id="5927" />
+<TGConnectingPoint num="2" id="5928" />
+<TGConnectingPoint num="3" id="5929" />
 <extraparam>
-<guard value="[ not(tmp1.data == rpk) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8284,27 +7723,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4190" >
-<cdparam x="429" y="930" />
+<CONNECTOR type="5102" id="5939" >
+<cdparam x="392" y="1287" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4189" />
-<P1  x="404" y="930" id="5224" />
-<P2  x="434" y="978" id="5128" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5938" />
+<P1  x="392" y="1287" id="6855" />
+<P2  x="399" y="1324" id="6814" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4188" >
-<father id="4190" num="0" />
-<cdparam x="443" y="958" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5937" >
+<father id="5939" num="0" />
+<cdparam x="408" y="1300" />
+<sizeparam width="10" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4184" />
-<TGConnectingPoint num="1" id="4185" />
-<TGConnectingPoint num="2" id="4186" />
-<TGConnectingPoint num="3" id="4187" />
+<TGConnectingPoint num="0" id="5933" />
+<TGConnectingPoint num="1" id="5934" />
+<TGConnectingPoint num="2" id="5935" />
+<TGConnectingPoint num="3" id="5936" />
 <extraparam>
-<guard value="[ tmp1.data == rpk ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8312,25 +7751,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4197" >
-<cdparam x="429" y="1187" />
+<CONNECTOR type="5102" id="5946" >
+<cdparam x="386" y="1374" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4196" />
-<P1  x="429" y="1187" id="5041" />
-<P2  x="434" y="1192" id="5024" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="5945" />
+<P1  x="386" y="1374" id="6842" />
+<P2  x="390" y="1405" id="6785" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4195" >
-<father id="4197" num="0" />
-<cdparam x="429" y="1227" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5944" >
+<father id="5946" num="0" />
+<cdparam x="386" y="1414" />
 <sizeparam width="10" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4191" />
-<TGConnectingPoint num="1" id="4192" />
-<TGConnectingPoint num="2" id="4193" />
-<TGConnectingPoint num="3" id="4194" />
+<TGConnectingPoint num="0" id="5940" />
+<TGConnectingPoint num="1" id="5941" />
+<TGConnectingPoint num="2" id="5942" />
+<TGConnectingPoint num="3" id="5943" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8340,55 +7779,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4204" >
-<cdparam x="434" y="1222" />
+<CONNECTOR type="5102" id="5953" >
+<cdparam x="390" y="1435" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4203" />
-<P1  x="434" y="1222" id="5025" />
-<P2  x="412" y="1247" id="5000" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="5952" />
+<P1  x="390" y="1435" id="6786" />
+<P2  x="400" y="1491" id="6745" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4202" >
-<father id="4204" num="0" />
-<cdparam x="434" y="1262" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5951" >
+<father id="5953" num="0" />
+<cdparam x="406" y="1456" />
+<sizeparam width="135" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4198" />
-<TGConnectingPoint num="1" id="4199" />
-<TGConnectingPoint num="2" id="4200" />
-<TGConnectingPoint num="3" id="4201" />
+<TGConnectingPoint num="0" id="5947" />
+<TGConnectingPoint num="1" id="5948" />
+<TGConnectingPoint num="2" id="5949" />
+<TGConnectingPoint num="3" id="5950" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m4,tmp3,tmp4)" />
+<actions value="get2(tmp3,tmp1,tmp2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4211" >
-<cdparam x="412" y="1297" />
+<CONNECTOR type="5102" id="5960" >
+<cdparam x="350" y="1541" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4210" />
-<P1  x="412" y="1297" id="5012" />
-<P2  x="412" y="1311" id="4955" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5959" />
+<P1  x="350" y="1541" id="6749" />
+<P2  x="327" y="1579" id="6705" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4209" >
-<father id="4211" num="0" />
-<cdparam x="412" y="1337" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5958" >
+<father id="5960" num="0" />
+<cdparam x="184" y="1554" />
+<sizeparam width="149" 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="1400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4205" />
-<TGConnectingPoint num="1" id="4206" />
-<TGConnectingPoint num="2" id="4207" />
-<TGConnectingPoint num="3" id="4208" />
+<TGConnectingPoint num="0" id="5954" />
+<TGConnectingPoint num="1" id="5955" />
+<TGConnectingPoint num="2" id="5956" />
+<TGConnectingPoint num="3" id="5957" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp2.data == ts4) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8396,57 +7837,56 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4218" >
-<cdparam x="412" y="1341" />
+<CONNECTOR type="5102" id="5967" >
+<cdparam x="450" y="1541" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4217" />
-<P1  x="412" y="1341" id="4956" />
-<P2  x="406" y="1402" id="4915" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="5966" />
+<P1  x="450" y="1541" id="6751" />
+<P2  x="454" y="1583" id="6670" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4216" >
-<father id="4218" num="0" />
-<cdparam x="420" y="1366" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5965" >
+<father id="5967" num="0" />
+<cdparam x="459" y="1556" />
+<sizeparam width="198" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4212" />
-<TGConnectingPoint num="1" id="4213" />
-<TGConnectingPoint num="2" id="4214" />
-<TGConnectingPoint num="3" id="4215" />
+<TGConnectingPoint num="0" id="5961" />
+<TGConnectingPoint num="1" id="5962" />
+<TGConnectingPoint num="2" id="5963" />
+<TGConnectingPoint num="3" id="5964" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp2.data == ts4 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m3,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
+<actions value="b = verifySign(tmp3,tmp4,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4225" >
-<cdparam x="356" y="1452" />
+<CONNECTOR type="5102" id="5974" >
+<cdparam x="429" y="1633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4224" />
-<P1  x="368" y="1452" id="4942" />
-<P2  x="326" y="1507" id="4891" />
+<TGConnectingPoint num="0" id="5973" />
+<P1  x="429" y="1633" id="6667" />
+<P2  x="393" y="1673" id="6640" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4223" >
-<father id="4225" num="0" />
-<cdparam x="188" y="1471" />
-<sizeparam width="149" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5972" >
+<father id="5974" num="0" />
+<cdparam x="346" y="1656" />
+<sizeparam width="50" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4219" />
-<TGConnectingPoint num="1" id="4220" />
-<TGConnectingPoint num="2" id="4221" />
-<TGConnectingPoint num="3" id="4222" />
+<TGConnectingPoint num="0" id="5968" />
+<TGConnectingPoint num="1" id="5969" />
+<TGConnectingPoint num="2" id="5970" />
+<TGConnectingPoint num="3" id="5971" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts3) ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8454,56 +7894,55 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4232" >
-<cdparam x="456" y="1452" />
+<CONNECTOR type="5102" id="5981" >
+<cdparam x="529" y="1633" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4231" />
-<P1  x="431" y="1452" id="4929" />
-<P2  x="446" y="1506" id="4840" />
+<TGConnectingPoint num="0" id="5980" />
+<P1  x="529" y="1633" id="6669" />
+<P2  x="509" y="1674" id="6588" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4230" >
-<father id="4232" num="0" />
-<cdparam x="443" y="1474" />
-<sizeparam width="199" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5979" >
+<father id="5981" num="0" />
+<cdparam x="532" y="1649" />
+<sizeparam width="24" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4226" />
-<TGConnectingPoint num="1" id="4227" />
-<TGConnectingPoint num="2" id="4228" />
-<TGConnectingPoint num="3" id="4229" />
+<TGConnectingPoint num="0" id="5975" />
+<TGConnectingPoint num="1" id="5976" />
+<TGConnectingPoint num="2" id="5977" />
+<TGConnectingPoint num="3" id="5978" />
 <extraparam>
-<guard value="[ tmp3.data == ts3 ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4239" >
-<cdparam x="421" y="1565" />
+<CONNECTOR type="5102" id="5988" >
+<cdparam x="406" y="1723" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4238" />
-<P1  x="433" y="1556" id="4860" />
-<P2  x="388" y="1623" id="4809" />
+<TGConnectingPoint num="0" id="5987" />
+<P1  x="484" y="1724" id="6585" />
+<P2  x="415" y="1780" id="6556" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4237" >
-<father id="4239" num="0" />
-<cdparam x="348" y="1589" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5986" >
+<father id="5988" num="0" />
+<cdparam x="285" y="1756" />
+<sizeparam width="151" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4233" />
-<TGConnectingPoint num="1" id="4234" />
-<TGConnectingPoint num="2" id="4235" />
-<TGConnectingPoint num="3" id="4236" />
+<TGConnectingPoint num="0" id="5982" />
+<TGConnectingPoint num="1" id="5983" />
+<TGConnectingPoint num="2" id="5984" />
+<TGConnectingPoint num="3" id="5985" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ not(tmp1.data == ack) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8511,87 +7950,87 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4246" >
-<cdparam x="521" y="1565" />
+<CONNECTOR type="5102" id="5995" >
+<cdparam x="584" y="1724" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4245" />
-<P1  x="496" y="1556" id="4847" />
-<P2  x="501" y="1625" id="4758" />
+<TGConnectingPoint num="0" id="5994" />
+<P1  x="584" y="1724" id="6587" />
+<P2  x="580" y="1781" id="6515" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4244" >
-<father id="4246" num="0" />
-<cdparam x="508" y="1597" />
-<sizeparam width="195" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="5993" >
+<father id="5995" num="0" />
+<cdparam x="589" y="1756" />
+<sizeparam width="125" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4240" />
-<TGConnectingPoint num="1" id="4241" />
-<TGConnectingPoint num="2" id="4242" />
-<TGConnectingPoint num="3" id="4243" />
+<TGConnectingPoint num="0" id="5989" />
+<TGConnectingPoint num="1" id="5990" />
+<TGConnectingPoint num="2" id="5991" />
+<TGConnectingPoint num="3" id="5992" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ tmp1.data == ack ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sesk = adecrypt(tmp2,idk2sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4253" >
-<cdparam x="549" y="1687" />
+<CONNECTOR type="5102" id="6002" >
+<cdparam x="593" y="1831" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4252" />
-<P1  x="532" y="1675" id="4756" />
-<P2  x="533" y="1783" id="4710" />
+<TGConnectingPoint num="0" id="6001" />
+<P1  x="593" y="1831" id="6504" />
+<P2  x="583" y="1944" id="6441" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4251" >
-<father id="4253" num="0" />
-<cdparam x="550" y="1707" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6000" >
+<father id="6002" num="0" />
+<cdparam x="601" y="1856" />
+<sizeparam width="203" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4247" />
-<TGConnectingPoint num="1" id="4248" />
-<TGConnectingPoint num="2" id="4249" />
-<TGConnectingPoint num="3" id="4250" />
+<TGConnectingPoint num="0" id="5996" />
+<TGConnectingPoint num="1" id="5997" />
+<TGConnectingPoint num="2" id="5998" />
+<TGConnectingPoint num="3" id="5999" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = ack" />
-<actions value="tmp2.data = ts4" />
-<actions value="tmp3 = concat2(tmp1,tmp2)" />
-<actions value="tmp4 = sign(tmp3,idk2sk)" />
-<actions value="m4 = concat2(tmp3,tmp4)" />
+<actions value="tmp1.data = secretData" />
+<actions value="tmp2 = sencrypt(secretData, SesK)" />
+<actions value="tmp3.data = ts5" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = MAC(tmp4,SesK)" />
+<actions value="m5 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4260" >
-<cdparam x="520" y="1833" />
+<CONNECTOR type="5102" id="6009" >
+<cdparam x="595" y="1994" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4259" />
-<P1  x="520" y="1833" id="4738" />
-<P2  x="519" y="1853" id="4698" />
+<TGConnectingPoint num="0" id="6008" />
+<P1  x="583" y="1994" id="6446" />
+<P2  x="583" y="2015" id="6429" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4258" >
-<father id="4260" num="0" />
-<cdparam x="520" y="1873" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6007" >
+<father id="6009" num="0" />
+<cdparam x="595" y="2034" />
 <sizeparam width="10" 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="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4254" />
-<TGConnectingPoint num="1" id="4255" />
-<TGConnectingPoint num="2" id="4256" />
-<TGConnectingPoint num="3" id="4257" />
+<TGConnectingPoint num="0" id="6003" />
+<TGConnectingPoint num="1" id="6004" />
+<TGConnectingPoint num="2" id="6005" />
+<TGConnectingPoint num="3" id="6006" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8601,25 +8040,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4267" >
-<cdparam x="519" y="1883" />
+<CONNECTOR type="5102" id="6016" >
+<cdparam x="583" y="2045" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4266" />
-<P1  x="519" y="1883" id="4699" />
-<P2  x="515" y="1911" id="4665" />
+<TGConnectingPoint num="0" id="6015" />
+<P1  x="583" y="2045" id="6430" />
+<P2  x="580" y="2077" id="6389" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4265" >
-<father id="4267" num="0" />
-<cdparam x="519" y="1923" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6014" >
+<father id="6016" num="0" />
+<cdparam x="583" y="2085" />
 <sizeparam width="10" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4261" />
-<TGConnectingPoint num="1" id="4262" />
-<TGConnectingPoint num="2" id="4263" />
-<TGConnectingPoint num="3" id="4264" />
+<TGConnectingPoint num="0" id="6010" />
+<TGConnectingPoint num="1" id="6011" />
+<TGConnectingPoint num="2" id="6012" />
+<TGConnectingPoint num="3" id="6013" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8629,25 +8068,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4274" >
-<cdparam x="527" y="1961" />
+<CONNECTOR type="5102" id="6023" >
+<cdparam x="567" y="2127" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="4273" />
-<P1  x="527" y="1961" id="4686" />
-<P2  x="531" y="1989" id="4629" />
+<TGConnectingPoint num="0" id="6022" />
+<P1  x="567" y="2127" id="6417" />
+<P2  x="566" y="2151" id="6360" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4272" >
-<father id="4274" num="0" />
-<cdparam x="527" y="2001" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6021" >
+<father id="6023" num="0" />
+<cdparam x="567" y="2167" />
 <sizeparam width="10" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4268" />
-<TGConnectingPoint num="1" id="4269" />
-<TGConnectingPoint num="2" id="4270" />
-<TGConnectingPoint num="3" id="4271" />
+<TGConnectingPoint num="0" id="6017" />
+<TGConnectingPoint num="1" id="6018" />
+<TGConnectingPoint num="2" id="6019" />
+<TGConnectingPoint num="3" id="6020" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -8657,57 +8096,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4281" >
-<cdparam x="531" y="2019" />
+<CONNECTOR type="5102" id="6030" >
+<cdparam x="566" y="2181" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4280" />
-<P1  x="531" y="2019" id="4630" />
-<P2  x="532" y="2073" id="4589" />
+<TGConnectingPoint num="0" id="6029" />
+<P1  x="566" y="2181" id="6361" />
+<P2  x="544" y="2227" id="6327" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4279" >
-<father id="4281" num="0" />
-<cdparam x="540" y="2041" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6028" >
+<father id="6030" num="0" />
+<cdparam x="569" y="2200" />
 <sizeparam width="135" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4275" />
-<TGConnectingPoint num="1" id="4276" />
-<TGConnectingPoint num="2" id="4277" />
-<TGConnectingPoint num="3" id="4278" />
+<TGConnectingPoint num="0" id="6024" />
+<TGConnectingPoint num="1" id="6025" />
+<TGConnectingPoint num="2" id="6026" />
+<TGConnectingPoint num="3" id="6027" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m5,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
+<actions value="get2(m6,tmp3,tmp4)" />
+<actions value="get2(tmp3,tmp1,tmp2)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4288" >
-<cdparam x="494" y="2123" />
+<CONNECTOR type="5102" id="6037" >
+<cdparam x="519" y="2277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4287" />
-<P1  x="494" y="2123" id="4616" />
-<P2  x="428" y="2165" id="4565" />
+<TGConnectingPoint num="0" id="6036" />
+<P1  x="531" y="2277" id="6347" />
+<P2  x="497" y="2323" id="6280" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4286" >
-<father id="4288" num="0" />
-<cdparam x="313" y="2141" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6035" >
+<father id="6037" num="0" />
+<cdparam x="358" y="2298" />
 <sizeparam width="149" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4282" />
-<TGConnectingPoint num="1" id="4283" />
-<TGConnectingPoint num="2" id="4284" />
-<TGConnectingPoint num="3" id="4285" />
+<TGConnectingPoint num="0" id="6031" />
+<TGConnectingPoint num="1" id="6032" />
+<TGConnectingPoint num="2" id="6033" />
+<TGConnectingPoint num="3" id="6034" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts5) ]" />
+<guard value="[ not(tmp2.data == ts6) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8715,54 +8154,54 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4295" >
-<cdparam x="582" y="2123" />
+<CONNECTOR type="5102" id="6044" >
+<cdparam x="619" y="2277" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4294" />
-<P1  x="557" y="2123" id="4603" />
-<P2  x="578" y="2165" id="4523" />
+<TGConnectingPoint num="0" id="6043" />
+<P1  x="594" y="2277" id="6334" />
+<P2  x="618" y="2321" id="6254" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4293" >
-<father id="4295" num="0" />
-<cdparam x="590" y="2138" />
-<sizeparam width="187" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6042" >
+<father id="6044" num="0" />
+<cdparam x="616" y="2293" />
+<sizeparam width="188" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4289" />
-<TGConnectingPoint num="1" id="4290" />
-<TGConnectingPoint num="2" id="4291" />
-<TGConnectingPoint num="3" id="4292" />
+<TGConnectingPoint num="0" id="6038" />
+<TGConnectingPoint num="1" id="6039" />
+<TGConnectingPoint num="2" id="6040" />
+<TGConnectingPoint num="3" id="6041" />
 <extraparam>
-<guard value="[ tmp3.data == ts5 ]" />
+<guard value="[ tmp2.data == ts6 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(tmp4,tmp5,sesk)" />
+<actions value="b = verifyMAC(tmp3,tmp4,SesK)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4302" >
-<cdparam x="466" y="2215" />
+<CONNECTOR type="5102" id="6051" >
+<cdparam x="581" y="2371" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4301" />
-<P1  x="553" y="2215" id="4534" />
-<P2  x="469" y="2265" id="4482" />
+<TGConnectingPoint num="0" id="6050" />
+<P1  x="593" y="2371" id="6265" />
+<P2  x="540" y="2408" id="6197" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4300" >
-<father id="4302" num="0" />
-<cdparam x="460" y="2238" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6049" >
+<father id="6051" num="0" />
+<cdparam x="506" y="2388" />
 <sizeparam width="50" 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="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4296" />
-<TGConnectingPoint num="1" id="4297" />
-<TGConnectingPoint num="2" id="4298" />
-<TGConnectingPoint num="3" id="4299" />
+<TGConnectingPoint num="0" id="6045" />
+<TGConnectingPoint num="1" id="6046" />
+<TGConnectingPoint num="2" id="6047" />
+<TGConnectingPoint num="3" id="6048" />
 <extraparam>
 <guard value="[ not(b) ]" />
 <afterMin value="" />
@@ -8772,89 +8211,55 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4309" >
-<cdparam x="641" y="2215" />
+<CONNECTOR type="5102" id="6058" >
+<cdparam x="681" y="2371" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4308" />
-<P1  x="616" y="2215" id="4521" />
-<P2  x="650" y="2265" id="4432" />
+<TGConnectingPoint num="0" id="6057" />
+<P1  x="656" y="2371" id="6252" />
+<P2  x="687" y="2408" id="6172" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4307" >
-<father id="4309" num="0" />
-<cdparam x="638" y="2235" />
-<sizeparam width="151" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6056" >
+<father id="6058" num="0" />
+<cdparam x="693" y="2391" />
+<sizeparam width="24" 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="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4303" />
-<TGConnectingPoint num="1" id="4304" />
-<TGConnectingPoint num="2" id="4305" />
-<TGConnectingPoint num="3" id="4306" />
+<TGConnectingPoint num="0" id="6052" />
+<TGConnectingPoint num="1" id="6053" />
+<TGConnectingPoint num="2" id="6054" />
+<TGConnectingPoint num="3" id="6055" />
 <extraparam>
 <guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="sd = sdecrypt(tmp2,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4316" >
-<cdparam x="695" y="2315" />
+<CONNECTOR type="5102" id="6065" >
+<cdparam x="650" y="2458" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="4315" />
-<P1  x="681" y="2315" id="4430" />
-<P2  x="670" y="2407" id="4384" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4314" >
-<father id="4316" num="0" />
-<cdparam x="677" y="2337" />
-<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4310" />
-<TGConnectingPoint num="1" id="4311" />
-<TGConnectingPoint num="2" id="4312" />
-<TGConnectingPoint num="3" id="4313" />
-<extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<actions value="tmp1.data = ack" />
-<actions value="tmp2.data = ts6" />
-<actions value="tmp3 = concat2(tmp1,tmp2)" />
-<actions value="tmp4 = MAC(tmp3,sesk)" />
-<actions value="m6 = concat2(tmp3,tmp4)" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="4323" >
-<cdparam x="657" y="2457" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="4322" />
-<P1  x="657" y="2457" id="4412" />
-<P2  x="660" y="2480" id="4372" />
+<TGConnectingPoint num="0" id="6064" />
+<P1  x="662" y="2458" id="6183" />
+<P2  x="604" y="2519" id="6123" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4321" >
-<father id="4323" num="0" />
-<cdparam x="657" y="2497" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6063" >
+<father id="6065" num="0" />
+<cdparam x="473" y="2491" />
+<sizeparam width="151" 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="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4317" />
-<TGConnectingPoint num="1" id="4318" />
-<TGConnectingPoint num="2" id="4319" />
-<TGConnectingPoint num="3" id="4320" />
+<TGConnectingPoint num="0" id="6059" />
+<TGConnectingPoint num="1" id="6060" />
+<TGConnectingPoint num="2" id="6061" />
+<TGConnectingPoint num="3" id="6062" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp1.data == ack) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8862,27 +8267,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="4330" >
-<cdparam x="660" y="2510" />
+<CONNECTOR type="5102" id="6072" >
+<cdparam x="750" y="2458" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="4329" />
-<P1  x="660" y="2510" id="4373" />
-<P2  x="642" y="2537" id="4348" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="6071" />
+<P1  x="712" y="2458" id="6185" />
+<P2  x="726" y="2522" id="6089" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="4328" >
-<father id="4330" num="0" />
-<cdparam x="660" y="2550" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="6070" >
+<father id="6072" num="0" />
+<cdparam x="725" y="2486" />
+<sizeparam width="125" 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="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="4324" />
-<TGConnectingPoint num="1" id="4325" />
-<TGConnectingPoint num="2" id="4326" />
-<TGConnectingPoint num="3" id="4327" />
+<TGConnectingPoint num="0" id="6066" />
+<TGConnectingPoint num="1" id="6067" />
+<TGConnectingPoint num="2" id="6068" />
+<TGConnectingPoint num="3" id="6069" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp1.data == ack ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -8890,1994 +8295,1992 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="4371" >
-<cdparam x="595" y="2537" />
-<sizeparam width="128" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6113" >
+<cdparam x="711" y="2522" />
+<sizeparam width="131" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="state0" value="ProtocolRunEnded" />
-<TGConnectingPoint num="0" id="4331" />
-<TGConnectingPoint num="1" id="4332" />
-<TGConnectingPoint num="2" id="4333" />
-<TGConnectingPoint num="3" id="4334" />
-<TGConnectingPoint num="4" id="4335" />
-<TGConnectingPoint num="5" id="4336" />
-<TGConnectingPoint num="6" id="4337" />
-<TGConnectingPoint num="7" id="4338" />
-<TGConnectingPoint num="8" id="4339" />
-<TGConnectingPoint num="9" id="4340" />
-<TGConnectingPoint num="10" id="4341" />
-<TGConnectingPoint num="11" id="4342" />
-<TGConnectingPoint num="12" id="4343" />
-<TGConnectingPoint num="13" id="4344" />
-<TGConnectingPoint num="14" id="4345" />
-<TGConnectingPoint num="15" id="4346" />
-<TGConnectingPoint num="16" id="4347" />
-<TGConnectingPoint num="17" id="4348" />
-<TGConnectingPoint num="18" id="4349" />
-<TGConnectingPoint num="19" id="4350" />
-<TGConnectingPoint num="20" id="4351" />
-<TGConnectingPoint num="21" id="4352" />
-<TGConnectingPoint num="22" id="4353" />
-<TGConnectingPoint num="23" id="4354" />
-<TGConnectingPoint num="24" id="4355" />
-<TGConnectingPoint num="25" id="4356" />
-<TGConnectingPoint num="26" id="4357" />
-<TGConnectingPoint num="27" id="4358" />
-<TGConnectingPoint num="28" id="4359" />
-<TGConnectingPoint num="29" id="4360" />
-<TGConnectingPoint num="30" id="4361" />
-<TGConnectingPoint num="31" id="4362" />
-<TGConnectingPoint num="32" id="4363" />
-<TGConnectingPoint num="33" id="4364" />
-<TGConnectingPoint num="34" id="4365" />
-<TGConnectingPoint num="35" id="4366" />
-<TGConnectingPoint num="36" id="4367" />
-<TGConnectingPoint num="37" id="4368" />
-<TGConnectingPoint num="38" id="4369" />
-<TGConnectingPoint num="39" id="4370" />
+<TGConnectingPoint num="0" id="6073" />
+<TGConnectingPoint num="1" id="6074" />
+<TGConnectingPoint num="2" id="6075" />
+<TGConnectingPoint num="3" id="6076" />
+<TGConnectingPoint num="4" id="6077" />
+<TGConnectingPoint num="5" id="6078" />
+<TGConnectingPoint num="6" id="6079" />
+<TGConnectingPoint num="7" id="6080" />
+<TGConnectingPoint num="8" id="6081" />
+<TGConnectingPoint num="9" id="6082" />
+<TGConnectingPoint num="10" id="6083" />
+<TGConnectingPoint num="11" id="6084" />
+<TGConnectingPoint num="12" id="6085" />
+<TGConnectingPoint num="13" id="6086" />
+<TGConnectingPoint num="14" id="6087" />
+<TGConnectingPoint num="15" id="6088" />
+<TGConnectingPoint num="16" id="6089" />
+<TGConnectingPoint num="17" id="6090" />
+<TGConnectingPoint num="18" id="6091" />
+<TGConnectingPoint num="19" id="6092" />
+<TGConnectingPoint num="20" id="6093" />
+<TGConnectingPoint num="21" id="6094" />
+<TGConnectingPoint num="22" id="6095" />
+<TGConnectingPoint num="23" id="6096" />
+<TGConnectingPoint num="24" id="6097" />
+<TGConnectingPoint num="25" id="6098" />
+<TGConnectingPoint num="26" id="6099" />
+<TGConnectingPoint num="27" id="6100" />
+<TGConnectingPoint num="28" id="6101" />
+<TGConnectingPoint num="29" id="6102" />
+<TGConnectingPoint num="30" id="6103" />
+<TGConnectingPoint num="31" id="6104" />
+<TGConnectingPoint num="32" id="6105" />
+<TGConnectingPoint num="33" id="6106" />
+<TGConnectingPoint num="34" id="6107" />
+<TGConnectingPoint num="35" id="6108" />
+<TGConnectingPoint num="36" id="6109" />
+<TGConnectingPoint num="37" id="6110" />
+<TGConnectingPoint num="38" id="6111" />
+<TGConnectingPoint num="39" id="6112" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="4382" >
-<cdparam x="626" y="2485" />
-<sizeparam width="68" 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="2900" />
-<infoparam name="Send signal" value="chout(m6)" />
-<TGConnectingPoint num="0" id="4372" />
-<TGConnectingPoint num="1" id="4373" />
-<TGConnectingPoint num="2" id="4374" />
-<TGConnectingPoint num="3" id="4375" />
-<TGConnectingPoint num="4" id="4376" />
-<TGConnectingPoint num="5" id="4377" />
-<TGConnectingPoint num="6" id="4378" />
-<TGConnectingPoint num="7" id="4379" />
-<TGConnectingPoint num="8" id="4380" />
-<TGConnectingPoint num="9" id="4381" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="4423" >
-<cdparam x="620" y="2407" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6154" >
+<cdparam x="514" y="2519" />
+<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg6" />
-<TGConnectingPoint num="0" id="4383" />
-<TGConnectingPoint num="1" id="4384" />
-<TGConnectingPoint num="2" id="4385" />
-<TGConnectingPoint num="3" id="4386" />
-<TGConnectingPoint num="4" id="4387" />
-<TGConnectingPoint num="5" id="4388" />
-<TGConnectingPoint num="6" id="4389" />
-<TGConnectingPoint num="7" id="4390" />
-<TGConnectingPoint num="8" id="4391" />
-<TGConnectingPoint num="9" id="4392" />
-<TGConnectingPoint num="10" id="4393" />
-<TGConnectingPoint num="11" id="4394" />
-<TGConnectingPoint num="12" id="4395" />
-<TGConnectingPoint num="13" id="4396" />
-<TGConnectingPoint num="14" id="4397" />
-<TGConnectingPoint num="15" id="4398" />
-<TGConnectingPoint num="16" id="4399" />
-<TGConnectingPoint num="17" id="4400" />
-<TGConnectingPoint num="18" id="4401" />
-<TGConnectingPoint num="19" id="4402" />
-<TGConnectingPoint num="20" id="4403" />
-<TGConnectingPoint num="21" id="4404" />
-<TGConnectingPoint num="22" id="4405" />
-<TGConnectingPoint num="23" id="4406" />
-<TGConnectingPoint num="24" id="4407" />
-<TGConnectingPoint num="25" id="4408" />
-<TGConnectingPoint num="26" id="4409" />
-<TGConnectingPoint num="27" id="4410" />
-<TGConnectingPoint num="28" id="4411" />
-<TGConnectingPoint num="29" id="4412" />
-<TGConnectingPoint num="30" id="4413" />
-<TGConnectingPoint num="31" id="4414" />
-<TGConnectingPoint num="32" id="4415" />
-<TGConnectingPoint num="33" id="4416" />
-<TGConnectingPoint num="34" id="4417" />
-<TGConnectingPoint num="35" id="4418" />
-<TGConnectingPoint num="36" id="4419" />
-<TGConnectingPoint num="37" id="4420" />
-<TGConnectingPoint num="38" id="4421" />
-<TGConnectingPoint num="39" id="4422" />
+<infoparam name="state0" value="UnexpectedMsg6" />
+<TGConnectingPoint num="0" id="6114" />
+<TGConnectingPoint num="1" id="6115" />
+<TGConnectingPoint num="2" id="6116" />
+<TGConnectingPoint num="3" id="6117" />
+<TGConnectingPoint num="4" id="6118" />
+<TGConnectingPoint num="5" id="6119" />
+<TGConnectingPoint num="6" id="6120" />
+<TGConnectingPoint num="7" id="6121" />
+<TGConnectingPoint num="8" id="6122" />
+<TGConnectingPoint num="9" id="6123" />
+<TGConnectingPoint num="10" id="6124" />
+<TGConnectingPoint num="11" id="6125" />
+<TGConnectingPoint num="12" id="6126" />
+<TGConnectingPoint num="13" id="6127" />
+<TGConnectingPoint num="14" id="6128" />
+<TGConnectingPoint num="15" id="6129" />
+<TGConnectingPoint num="16" id="6130" />
+<TGConnectingPoint num="17" id="6131" />
+<TGConnectingPoint num="18" id="6132" />
+<TGConnectingPoint num="19" id="6133" />
+<TGConnectingPoint num="20" id="6134" />
+<TGConnectingPoint num="21" id="6135" />
+<TGConnectingPoint num="22" id="6136" />
+<TGConnectingPoint num="23" id="6137" />
+<TGConnectingPoint num="24" id="6138" />
+<TGConnectingPoint num="25" id="6139" />
+<TGConnectingPoint num="26" id="6140" />
+<TGConnectingPoint num="27" id="6141" />
+<TGConnectingPoint num="28" id="6142" />
+<TGConnectingPoint num="29" id="6143" />
+<TGConnectingPoint num="30" id="6144" />
+<TGConnectingPoint num="31" id="6145" />
+<TGConnectingPoint num="32" id="6146" />
+<TGConnectingPoint num="33" id="6147" />
+<TGConnectingPoint num="34" id="6148" />
+<TGConnectingPoint num="35" id="6149" />
+<TGConnectingPoint num="36" id="6150" />
+<TGConnectingPoint num="37" id="6151" />
+<TGConnectingPoint num="38" id="6152" />
+<TGConnectingPoint num="39" id="6153" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4464" >
-<cdparam x="620" y="2265" />
-<sizeparam width="123" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6195" >
+<cdparam x="650" y="2408" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SecretDataReceived" />
-<TGConnectingPoint num="0" id="4424" />
-<TGConnectingPoint num="1" id="4425" />
-<TGConnectingPoint num="2" id="4426" />
-<TGConnectingPoint num="3" id="4427" />
-<TGConnectingPoint num="4" id="4428" />
-<TGConnectingPoint num="5" id="4429" />
-<TGConnectingPoint num="6" id="4430" />
-<TGConnectingPoint num="7" id="4431" />
-<TGConnectingPoint num="8" id="4432" />
-<TGConnectingPoint num="9" id="4433" />
-<TGConnectingPoint num="10" id="4434" />
-<TGConnectingPoint num="11" id="4435" />
-<TGConnectingPoint num="12" id="4436" />
-<TGConnectingPoint num="13" id="4437" />
-<TGConnectingPoint num="14" id="4438" />
-<TGConnectingPoint num="15" id="4439" />
-<TGConnectingPoint num="16" id="4440" />
-<TGConnectingPoint num="17" id="4441" />
-<TGConnectingPoint num="18" id="4442" />
-<TGConnectingPoint num="19" id="4443" />
-<TGConnectingPoint num="20" id="4444" />
-<TGConnectingPoint num="21" id="4445" />
-<TGConnectingPoint num="22" id="4446" />
-<TGConnectingPoint num="23" id="4447" />
-<TGConnectingPoint num="24" id="4448" />
-<TGConnectingPoint num="25" id="4449" />
-<TGConnectingPoint num="26" id="4450" />
-<TGConnectingPoint num="27" id="4451" />
-<TGConnectingPoint num="28" id="4452" />
-<TGConnectingPoint num="29" id="4453" />
-<TGConnectingPoint num="30" id="4454" />
-<TGConnectingPoint num="31" id="4455" />
-<TGConnectingPoint num="32" id="4456" />
-<TGConnectingPoint num="33" id="4457" />
-<TGConnectingPoint num="34" id="4458" />
-<TGConnectingPoint num="35" id="4459" />
-<TGConnectingPoint num="36" id="4460" />
-<TGConnectingPoint num="37" id="4461" />
-<TGConnectingPoint num="38" id="4462" />
-<TGConnectingPoint num="39" id="4463" />
+<infoparam name="state0" value="Verifyack6" />
+<TGConnectingPoint num="0" id="6155" />
+<TGConnectingPoint num="1" id="6156" />
+<TGConnectingPoint num="2" id="6157" />
+<TGConnectingPoint num="3" id="6158" />
+<TGConnectingPoint num="4" id="6159" />
+<TGConnectingPoint num="5" id="6160" />
+<TGConnectingPoint num="6" id="6161" />
+<TGConnectingPoint num="7" id="6162" />
+<TGConnectingPoint num="8" id="6163" />
+<TGConnectingPoint num="9" id="6164" />
+<TGConnectingPoint num="10" id="6165" />
+<TGConnectingPoint num="11" id="6166" />
+<TGConnectingPoint num="12" id="6167" />
+<TGConnectingPoint num="13" id="6168" />
+<TGConnectingPoint num="14" id="6169" />
+<TGConnectingPoint num="15" id="6170" />
+<TGConnectingPoint num="16" id="6171" />
+<TGConnectingPoint num="17" id="6172" />
+<TGConnectingPoint num="18" id="6173" />
+<TGConnectingPoint num="19" id="6174" />
+<TGConnectingPoint num="20" id="6175" />
+<TGConnectingPoint num="21" id="6176" />
+<TGConnectingPoint num="22" id="6177" />
+<TGConnectingPoint num="23" id="6178" />
+<TGConnectingPoint num="24" id="6179" />
+<TGConnectingPoint num="25" id="6180" />
+<TGConnectingPoint num="26" id="6181" />
+<TGConnectingPoint num="27" id="6182" />
+<TGConnectingPoint num="28" id="6183" />
+<TGConnectingPoint num="29" id="6184" />
+<TGConnectingPoint num="30" id="6185" />
+<TGConnectingPoint num="31" id="6186" />
+<TGConnectingPoint num="32" id="6187" />
+<TGConnectingPoint num="33" id="6188" />
+<TGConnectingPoint num="34" id="6189" />
+<TGConnectingPoint num="35" id="6190" />
+<TGConnectingPoint num="36" id="6191" />
+<TGConnectingPoint num="37" id="6192" />
+<TGConnectingPoint num="38" id="6193" />
+<TGConnectingPoint num="39" id="6194" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4505" >
-<cdparam x="432" y="2265" />
+<COMPONENT type="5106" id="6236" >
+<cdparam x="490" y="2408" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidMAC5" />
-<TGConnectingPoint num="0" id="4465" />
-<TGConnectingPoint num="1" id="4466" />
-<TGConnectingPoint num="2" id="4467" />
-<TGConnectingPoint num="3" id="4468" />
-<TGConnectingPoint num="4" id="4469" />
-<TGConnectingPoint num="5" id="4470" />
-<TGConnectingPoint num="6" id="4471" />
-<TGConnectingPoint num="7" id="4472" />
-<TGConnectingPoint num="8" id="4473" />
-<TGConnectingPoint num="9" id="4474" />
-<TGConnectingPoint num="10" id="4475" />
-<TGConnectingPoint num="11" id="4476" />
-<TGConnectingPoint num="12" id="4477" />
-<TGConnectingPoint num="13" id="4478" />
-<TGConnectingPoint num="14" id="4479" />
-<TGConnectingPoint num="15" id="4480" />
-<TGConnectingPoint num="16" id="4481" />
-<TGConnectingPoint num="17" id="4482" />
-<TGConnectingPoint num="18" id="4483" />
-<TGConnectingPoint num="19" id="4484" />
-<TGConnectingPoint num="20" id="4485" />
-<TGConnectingPoint num="21" id="4486" />
-<TGConnectingPoint num="22" id="4487" />
-<TGConnectingPoint num="23" id="4488" />
-<TGConnectingPoint num="24" id="4489" />
-<TGConnectingPoint num="25" id="4490" />
-<TGConnectingPoint num="26" id="4491" />
-<TGConnectingPoint num="27" id="4492" />
-<TGConnectingPoint num="28" id="4493" />
-<TGConnectingPoint num="29" id="4494" />
-<TGConnectingPoint num="30" id="4495" />
-<TGConnectingPoint num="31" id="4496" />
-<TGConnectingPoint num="32" id="4497" />
-<TGConnectingPoint num="33" id="4498" />
-<TGConnectingPoint num="34" id="4499" />
-<TGConnectingPoint num="35" id="4500" />
-<TGConnectingPoint num="36" id="4501" />
-<TGConnectingPoint num="37" id="4502" />
-<TGConnectingPoint num="38" id="4503" />
-<TGConnectingPoint num="39" id="4504" />
+<infoparam name="state0" value="InvalidMAC6" />
+<TGConnectingPoint num="0" id="6196" />
+<TGConnectingPoint num="1" id="6197" />
+<TGConnectingPoint num="2" id="6198" />
+<TGConnectingPoint num="3" id="6199" />
+<TGConnectingPoint num="4" id="6200" />
+<TGConnectingPoint num="5" id="6201" />
+<TGConnectingPoint num="6" id="6202" />
+<TGConnectingPoint num="7" id="6203" />
+<TGConnectingPoint num="8" id="6204" />
+<TGConnectingPoint num="9" id="6205" />
+<TGConnectingPoint num="10" id="6206" />
+<TGConnectingPoint num="11" id="6207" />
+<TGConnectingPoint num="12" id="6208" />
+<TGConnectingPoint num="13" id="6209" />
+<TGConnectingPoint num="14" id="6210" />
+<TGConnectingPoint num="15" id="6211" />
+<TGConnectingPoint num="16" id="6212" />
+<TGConnectingPoint num="17" id="6213" />
+<TGConnectingPoint num="18" id="6214" />
+<TGConnectingPoint num="19" id="6215" />
+<TGConnectingPoint num="20" id="6216" />
+<TGConnectingPoint num="21" id="6217" />
+<TGConnectingPoint num="22" id="6218" />
+<TGConnectingPoint num="23" id="6219" />
+<TGConnectingPoint num="24" id="6220" />
+<TGConnectingPoint num="25" id="6221" />
+<TGConnectingPoint num="26" id="6222" />
+<TGConnectingPoint num="27" id="6223" />
+<TGConnectingPoint num="28" id="6224" />
+<TGConnectingPoint num="29" id="6225" />
+<TGConnectingPoint num="30" id="6226" />
+<TGConnectingPoint num="31" id="6227" />
+<TGConnectingPoint num="32" id="6228" />
+<TGConnectingPoint num="33" id="6229" />
+<TGConnectingPoint num="34" id="6230" />
+<TGConnectingPoint num="35" id="6231" />
+<TGConnectingPoint num="36" id="6232" />
+<TGConnectingPoint num="37" id="6233" />
+<TGConnectingPoint num="38" id="6234" />
+<TGConnectingPoint num="39" id="6235" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4546" >
-<cdparam x="541" y="2165" />
+<COMPONENT type="5106" id="6277" >
+<cdparam x="581" y="2321" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyMAC5" />
-<TGConnectingPoint num="0" id="4506" />
-<TGConnectingPoint num="1" id="4507" />
-<TGConnectingPoint num="2" id="4508" />
-<TGConnectingPoint num="3" id="4509" />
-<TGConnectingPoint num="4" id="4510" />
-<TGConnectingPoint num="5" id="4511" />
-<TGConnectingPoint num="6" id="4512" />
-<TGConnectingPoint num="7" id="4513" />
-<TGConnectingPoint num="8" id="4514" />
-<TGConnectingPoint num="9" id="4515" />
-<TGConnectingPoint num="10" id="4516" />
-<TGConnectingPoint num="11" id="4517" />
-<TGConnectingPoint num="12" id="4518" />
-<TGConnectingPoint num="13" id="4519" />
-<TGConnectingPoint num="14" id="4520" />
-<TGConnectingPoint num="15" id="4521" />
-<TGConnectingPoint num="16" id="4522" />
-<TGConnectingPoint num="17" id="4523" />
-<TGConnectingPoint num="18" id="4524" />
-<TGConnectingPoint num="19" id="4525" />
-<TGConnectingPoint num="20" id="4526" />
-<TGConnectingPoint num="21" id="4527" />
-<TGConnectingPoint num="22" id="4528" />
-<TGConnectingPoint num="23" id="4529" />
-<TGConnectingPoint num="24" id="4530" />
-<TGConnectingPoint num="25" id="4531" />
-<TGConnectingPoint num="26" id="4532" />
-<TGConnectingPoint num="27" id="4533" />
-<TGConnectingPoint num="28" id="4534" />
-<TGConnectingPoint num="29" id="4535" />
-<TGConnectingPoint num="30" id="4536" />
-<TGConnectingPoint num="31" id="4537" />
-<TGConnectingPoint num="32" id="4538" />
-<TGConnectingPoint num="33" id="4539" />
-<TGConnectingPoint num="34" id="4540" />
-<TGConnectingPoint num="35" id="4541" />
-<TGConnectingPoint num="36" id="4542" />
-<TGConnectingPoint num="37" id="4543" />
-<TGConnectingPoint num="38" id="4544" />
-<TGConnectingPoint num="39" id="4545" />
+<infoparam name="state0" value="VerifyMAC6" />
+<TGConnectingPoint num="0" id="6237" />
+<TGConnectingPoint num="1" id="6238" />
+<TGConnectingPoint num="2" id="6239" />
+<TGConnectingPoint num="3" id="6240" />
+<TGConnectingPoint num="4" id="6241" />
+<TGConnectingPoint num="5" id="6242" />
+<TGConnectingPoint num="6" id="6243" />
+<TGConnectingPoint num="7" id="6244" />
+<TGConnectingPoint num="8" id="6245" />
+<TGConnectingPoint num="9" id="6246" />
+<TGConnectingPoint num="10" id="6247" />
+<TGConnectingPoint num="11" id="6248" />
+<TGConnectingPoint num="12" id="6249" />
+<TGConnectingPoint num="13" id="6250" />
+<TGConnectingPoint num="14" id="6251" />
+<TGConnectingPoint num="15" id="6252" />
+<TGConnectingPoint num="16" id="6253" />
+<TGConnectingPoint num="17" id="6254" />
+<TGConnectingPoint num="18" id="6255" />
+<TGConnectingPoint num="19" id="6256" />
+<TGConnectingPoint num="20" id="6257" />
+<TGConnectingPoint num="21" id="6258" />
+<TGConnectingPoint num="22" id="6259" />
+<TGConnectingPoint num="23" id="6260" />
+<TGConnectingPoint num="24" id="6261" />
+<TGConnectingPoint num="25" id="6262" />
+<TGConnectingPoint num="26" id="6263" />
+<TGConnectingPoint num="27" id="6264" />
+<TGConnectingPoint num="28" id="6265" />
+<TGConnectingPoint num="29" id="6266" />
+<TGConnectingPoint num="30" id="6267" />
+<TGConnectingPoint num="31" id="6268" />
+<TGConnectingPoint num="32" id="6269" />
+<TGConnectingPoint num="33" id="6270" />
+<TGConnectingPoint num="34" id="6271" />
+<TGConnectingPoint num="35" id="6272" />
+<TGConnectingPoint num="36" id="6273" />
+<TGConnectingPoint num="37" id="6274" />
+<TGConnectingPoint num="38" id="6275" />
+<TGConnectingPoint num="39" id="6276" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4587" >
-<cdparam x="366" y="2165" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts5" />
-<TGConnectingPoint num="0" id="4547" />
-<TGConnectingPoint num="1" id="4548" />
-<TGConnectingPoint num="2" id="4549" />
-<TGConnectingPoint num="3" id="4550" />
-<TGConnectingPoint num="4" id="4551" />
-<TGConnectingPoint num="5" id="4552" />
-<TGConnectingPoint num="6" id="4553" />
-<TGConnectingPoint num="7" id="4554" />
-<TGConnectingPoint num="8" id="4555" />
-<TGConnectingPoint num="9" id="4556" />
-<TGConnectingPoint num="10" id="4557" />
-<TGConnectingPoint num="11" id="4558" />
-<TGConnectingPoint num="12" id="4559" />
-<TGConnectingPoint num="13" id="4560" />
-<TGConnectingPoint num="14" id="4561" />
-<TGConnectingPoint num="15" id="4562" />
-<TGConnectingPoint num="16" id="4563" />
-<TGConnectingPoint num="17" id="4564" />
-<TGConnectingPoint num="18" id="4565" />
-<TGConnectingPoint num="19" id="4566" />
-<TGConnectingPoint num="20" id="4567" />
-<TGConnectingPoint num="21" id="4568" />
-<TGConnectingPoint num="22" id="4569" />
-<TGConnectingPoint num="23" id="4570" />
-<TGConnectingPoint num="24" id="4571" />
-<TGConnectingPoint num="25" id="4572" />
-<TGConnectingPoint num="26" id="4573" />
-<TGConnectingPoint num="27" id="4574" />
-<TGConnectingPoint num="28" id="4575" />
-<TGConnectingPoint num="29" id="4576" />
-<TGConnectingPoint num="30" id="4577" />
-<TGConnectingPoint num="31" id="4578" />
-<TGConnectingPoint num="32" id="4579" />
-<TGConnectingPoint num="33" id="4580" />
-<TGConnectingPoint num="34" id="4581" />
-<TGConnectingPoint num="35" id="4582" />
-<TGConnectingPoint num="36" id="4583" />
-<TGConnectingPoint num="37" id="4584" />
-<TGConnectingPoint num="38" id="4585" />
-<TGConnectingPoint num="39" id="4586" />
+<COMPONENT type="5106" id="6318" >
+<cdparam x="397" y="2323" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="Invalidt6" />
+<TGConnectingPoint num="0" id="6278" />
+<TGConnectingPoint num="1" id="6279" />
+<TGConnectingPoint num="2" id="6280" />
+<TGConnectingPoint num="3" id="6281" />
+<TGConnectingPoint num="4" id="6282" />
+<TGConnectingPoint num="5" id="6283" />
+<TGConnectingPoint num="6" id="6284" />
+<TGConnectingPoint num="7" id="6285" />
+<TGConnectingPoint num="8" id="6286" />
+<TGConnectingPoint num="9" id="6287" />
+<TGConnectingPoint num="10" id="6288" />
+<TGConnectingPoint num="11" id="6289" />
+<TGConnectingPoint num="12" id="6290" />
+<TGConnectingPoint num="13" id="6291" />
+<TGConnectingPoint num="14" id="6292" />
+<TGConnectingPoint num="15" id="6293" />
+<TGConnectingPoint num="16" id="6294" />
+<TGConnectingPoint num="17" id="6295" />
+<TGConnectingPoint num="18" id="6296" />
+<TGConnectingPoint num="19" id="6297" />
+<TGConnectingPoint num="20" id="6298" />
+<TGConnectingPoint num="21" id="6299" />
+<TGConnectingPoint num="22" id="6300" />
+<TGConnectingPoint num="23" id="6301" />
+<TGConnectingPoint num="24" id="6302" />
+<TGConnectingPoint num="25" id="6303" />
+<TGConnectingPoint num="26" id="6304" />
+<TGConnectingPoint num="27" id="6305" />
+<TGConnectingPoint num="28" id="6306" />
+<TGConnectingPoint num="29" id="6307" />
+<TGConnectingPoint num="30" id="6308" />
+<TGConnectingPoint num="31" id="6309" />
+<TGConnectingPoint num="32" id="6310" />
+<TGConnectingPoint num="33" id="6311" />
+<TGConnectingPoint num="34" id="6312" />
+<TGConnectingPoint num="35" id="6313" />
+<TGConnectingPoint num="36" id="6314" />
+<TGConnectingPoint num="37" id="6315" />
+<TGConnectingPoint num="38" id="6316" />
+<TGConnectingPoint num="39" id="6317" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4628" >
-<cdparam x="482" y="2073" />
+<COMPONENT type="5106" id="6359" >
+<cdparam x="519" y="2227" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts5" />
-<TGConnectingPoint num="0" id="4588" />
-<TGConnectingPoint num="1" id="4589" />
-<TGConnectingPoint num="2" id="4590" />
-<TGConnectingPoint num="3" id="4591" />
-<TGConnectingPoint num="4" id="4592" />
-<TGConnectingPoint num="5" id="4593" />
-<TGConnectingPoint num="6" id="4594" />
-<TGConnectingPoint num="7" id="4595" />
-<TGConnectingPoint num="8" id="4596" />
-<TGConnectingPoint num="9" id="4597" />
-<TGConnectingPoint num="10" id="4598" />
-<TGConnectingPoint num="11" id="4599" />
-<TGConnectingPoint num="12" id="4600" />
-<TGConnectingPoint num="13" id="4601" />
-<TGConnectingPoint num="14" id="4602" />
-<TGConnectingPoint num="15" id="4603" />
-<TGConnectingPoint num="16" id="4604" />
-<TGConnectingPoint num="17" id="4605" />
-<TGConnectingPoint num="18" id="4606" />
-<TGConnectingPoint num="19" id="4607" />
-<TGConnectingPoint num="20" id="4608" />
-<TGConnectingPoint num="21" id="4609" />
-<TGConnectingPoint num="22" id="4610" />
-<TGConnectingPoint num="23" id="4611" />
-<TGConnectingPoint num="24" id="4612" />
-<TGConnectingPoint num="25" id="4613" />
-<TGConnectingPoint num="26" id="4614" />
-<TGConnectingPoint num="27" id="4615" />
-<TGConnectingPoint num="28" id="4616" />
-<TGConnectingPoint num="29" id="4617" />
-<TGConnectingPoint num="30" id="4618" />
-<TGConnectingPoint num="31" id="4619" />
-<TGConnectingPoint num="32" id="4620" />
-<TGConnectingPoint num="33" id="4621" />
-<TGConnectingPoint num="34" id="4622" />
-<TGConnectingPoint num="35" id="4623" />
-<TGConnectingPoint num="36" id="4624" />
-<TGConnectingPoint num="37" id="4625" />
-<TGConnectingPoint num="38" id="4626" />
-<TGConnectingPoint num="39" id="4627" />
+<infoparam name="state0" value="Testt6" />
+<TGConnectingPoint num="0" id="6319" />
+<TGConnectingPoint num="1" id="6320" />
+<TGConnectingPoint num="2" id="6321" />
+<TGConnectingPoint num="3" id="6322" />
+<TGConnectingPoint num="4" id="6323" />
+<TGConnectingPoint num="5" id="6324" />
+<TGConnectingPoint num="6" id="6325" />
+<TGConnectingPoint num="7" id="6326" />
+<TGConnectingPoint num="8" id="6327" />
+<TGConnectingPoint num="9" id="6328" />
+<TGConnectingPoint num="10" id="6329" />
+<TGConnectingPoint num="11" id="6330" />
+<TGConnectingPoint num="12" id="6331" />
+<TGConnectingPoint num="13" id="6332" />
+<TGConnectingPoint num="14" id="6333" />
+<TGConnectingPoint num="15" id="6334" />
+<TGConnectingPoint num="16" id="6335" />
+<TGConnectingPoint num="17" id="6336" />
+<TGConnectingPoint num="18" id="6337" />
+<TGConnectingPoint num="19" id="6338" />
+<TGConnectingPoint num="20" id="6339" />
+<TGConnectingPoint num="21" id="6340" />
+<TGConnectingPoint num="22" id="6341" />
+<TGConnectingPoint num="23" id="6342" />
+<TGConnectingPoint num="24" id="6343" />
+<TGConnectingPoint num="25" id="6344" />
+<TGConnectingPoint num="26" id="6345" />
+<TGConnectingPoint num="27" id="6346" />
+<TGConnectingPoint num="28" id="6347" />
+<TGConnectingPoint num="29" id="6348" />
+<TGConnectingPoint num="30" id="6349" />
+<TGConnectingPoint num="31" id="6350" />
+<TGConnectingPoint num="32" id="6351" />
+<TGConnectingPoint num="33" id="6352" />
+<TGConnectingPoint num="34" id="6353" />
+<TGConnectingPoint num="35" id="6354" />
+<TGConnectingPoint num="36" id="6355" />
+<TGConnectingPoint num="37" id="6356" />
+<TGConnectingPoint num="38" id="6357" />
+<TGConnectingPoint num="39" id="6358" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4639" >
-<cdparam x="497" y="1994" />
+<COMPONENT type="5104" id="6370" >
+<cdparam x="532" y="2156" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Receive signal" value="chin(m5)" />
-<TGConnectingPoint num="0" id="4629" />
-<TGConnectingPoint num="1" id="4630" />
-<TGConnectingPoint num="2" id="4631" />
-<TGConnectingPoint num="3" id="4632" />
-<TGConnectingPoint num="4" id="4633" />
-<TGConnectingPoint num="5" id="4634" />
-<TGConnectingPoint num="6" id="4635" />
-<TGConnectingPoint num="7" id="4636" />
-<TGConnectingPoint num="8" id="4637" />
-<TGConnectingPoint num="9" id="4638" />
+<infoparam name="Receive signal" value="chin(m6)" />
+<TGConnectingPoint num="0" id="6360" />
+<TGConnectingPoint num="1" id="6361" />
+<TGConnectingPoint num="2" id="6362" />
+<TGConnectingPoint num="3" id="6363" />
+<TGConnectingPoint num="4" id="6364" />
+<TGConnectingPoint num="5" id="6365" />
+<TGConnectingPoint num="6" id="6366" />
+<TGConnectingPoint num="7" id="6367" />
+<TGConnectingPoint num="8" id="6368" />
+<TGConnectingPoint num="9" id="6369" />
 </COMPONENT>
 
-<COMPONENT type="301" id="4656" >
-<cdparam x="692" y="1907" />
-<sizeparam width="276" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="6387" >
+<cdparam x="741" y="2073" />
+<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify message with secret data
+<infoparam name="UML Note" value="Receive and verify ack message from ECU2
 " />
-<TGConnectingPoint num="0" id="4640" />
-<TGConnectingPoint num="1" id="4641" />
-<TGConnectingPoint num="2" id="4642" />
-<TGConnectingPoint num="3" id="4643" />
-<TGConnectingPoint num="4" id="4644" />
-<TGConnectingPoint num="5" id="4645" />
-<TGConnectingPoint num="6" id="4646" />
-<TGConnectingPoint num="7" id="4647" />
-<TGConnectingPoint num="8" id="4648" />
-<TGConnectingPoint num="9" id="4649" />
-<TGConnectingPoint num="10" id="4650" />
-<TGConnectingPoint num="11" id="4651" />
-<TGConnectingPoint num="12" id="4652" />
-<TGConnectingPoint num="13" id="4653" />
-<TGConnectingPoint num="14" id="4654" />
-<TGConnectingPoint num="15" id="4655" />
+<TGConnectingPoint num="0" id="6371" />
+<TGConnectingPoint num="1" id="6372" />
+<TGConnectingPoint num="2" id="6373" />
+<TGConnectingPoint num="3" id="6374" />
+<TGConnectingPoint num="4" id="6375" />
+<TGConnectingPoint num="5" id="6376" />
+<TGConnectingPoint num="6" id="6377" />
+<TGConnectingPoint num="7" id="6378" />
+<TGConnectingPoint num="8" id="6379" />
+<TGConnectingPoint num="9" id="6380" />
+<TGConnectingPoint num="10" id="6381" />
+<TGConnectingPoint num="11" id="6382" />
+<TGConnectingPoint num="12" id="6383" />
+<TGConnectingPoint num="13" id="6384" />
+<TGConnectingPoint num="14" id="6385" />
+<TGConnectingPoint num="15" id="6386" />
 <extraparam>
-<Line value="Receive and verify message with secret data" />
+<Line value="Receive and verify ack message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4697" >
-<cdparam x="490" y="1911" />
+<COMPONENT type="5106" id="6428" >
+<cdparam x="530" y="2077" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg5" />
-<TGConnectingPoint num="0" id="4657" />
-<TGConnectingPoint num="1" id="4658" />
-<TGConnectingPoint num="2" id="4659" />
-<TGConnectingPoint num="3" id="4660" />
-<TGConnectingPoint num="4" id="4661" />
-<TGConnectingPoint num="5" id="4662" />
-<TGConnectingPoint num="6" id="4663" />
-<TGConnectingPoint num="7" id="4664" />
-<TGConnectingPoint num="8" id="4665" />
-<TGConnectingPoint num="9" id="4666" />
-<TGConnectingPoint num="10" id="4667" />
-<TGConnectingPoint num="11" id="4668" />
-<TGConnectingPoint num="12" id="4669" />
-<TGConnectingPoint num="13" id="4670" />
-<TGConnectingPoint num="14" id="4671" />
-<TGConnectingPoint num="15" id="4672" />
-<TGConnectingPoint num="16" id="4673" />
-<TGConnectingPoint num="17" id="4674" />
-<TGConnectingPoint num="18" id="4675" />
-<TGConnectingPoint num="19" id="4676" />
-<TGConnectingPoint num="20" id="4677" />
-<TGConnectingPoint num="21" id="4678" />
-<TGConnectingPoint num="22" id="4679" />
-<TGConnectingPoint num="23" id="4680" />
-<TGConnectingPoint num="24" id="4681" />
-<TGConnectingPoint num="25" id="4682" />
-<TGConnectingPoint num="26" id="4683" />
-<TGConnectingPoint num="27" id="4684" />
-<TGConnectingPoint num="28" id="4685" />
-<TGConnectingPoint num="29" id="4686" />
-<TGConnectingPoint num="30" id="4687" />
-<TGConnectingPoint num="31" id="4688" />
-<TGConnectingPoint num="32" id="4689" />
-<TGConnectingPoint num="33" id="4690" />
-<TGConnectingPoint num="34" id="4691" />
-<TGConnectingPoint num="35" id="4692" />
-<TGConnectingPoint num="36" id="4693" />
-<TGConnectingPoint num="37" id="4694" />
-<TGConnectingPoint num="38" id="4695" />
-<TGConnectingPoint num="39" id="4696" />
+<infoparam name="state0" value="WaitForMsg6" />
+<TGConnectingPoint num="0" id="6388" />
+<TGConnectingPoint num="1" id="6389" />
+<TGConnectingPoint num="2" id="6390" />
+<TGConnectingPoint num="3" id="6391" />
+<TGConnectingPoint num="4" id="6392" />
+<TGConnectingPoint num="5" id="6393" />
+<TGConnectingPoint num="6" id="6394" />
+<TGConnectingPoint num="7" id="6395" />
+<TGConnectingPoint num="8" id="6396" />
+<TGConnectingPoint num="9" id="6397" />
+<TGConnectingPoint num="10" id="6398" />
+<TGConnectingPoint num="11" id="6399" />
+<TGConnectingPoint num="12" id="6400" />
+<TGConnectingPoint num="13" id="6401" />
+<TGConnectingPoint num="14" id="6402" />
+<TGConnectingPoint num="15" id="6403" />
+<TGConnectingPoint num="16" id="6404" />
+<TGConnectingPoint num="17" id="6405" />
+<TGConnectingPoint num="18" id="6406" />
+<TGConnectingPoint num="19" id="6407" />
+<TGConnectingPoint num="20" id="6408" />
+<TGConnectingPoint num="21" id="6409" />
+<TGConnectingPoint num="22" id="6410" />
+<TGConnectingPoint num="23" id="6411" />
+<TGConnectingPoint num="24" id="6412" />
+<TGConnectingPoint num="25" id="6413" />
+<TGConnectingPoint num="26" id="6414" />
+<TGConnectingPoint num="27" id="6415" />
+<TGConnectingPoint num="28" id="6416" />
+<TGConnectingPoint num="29" id="6417" />
+<TGConnectingPoint num="30" id="6418" />
+<TGConnectingPoint num="31" id="6419" />
+<TGConnectingPoint num="32" id="6420" />
+<TGConnectingPoint num="33" id="6421" />
+<TGConnectingPoint num="34" id="6422" />
+<TGConnectingPoint num="35" id="6423" />
+<TGConnectingPoint num="36" id="6424" />
+<TGConnectingPoint num="37" id="6425" />
+<TGConnectingPoint num="38" id="6426" />
+<TGConnectingPoint num="39" id="6427" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="4708" >
-<cdparam x="485" y="1858" />
+<COMPONENT type="5103" id="6439" >
+<cdparam x="549" y="2020" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Send signal" value="chout(m4)" />
-<TGConnectingPoint num="0" id="4698" />
-<TGConnectingPoint num="1" id="4699" />
-<TGConnectingPoint num="2" id="4700" />
-<TGConnectingPoint num="3" id="4701" />
-<TGConnectingPoint num="4" id="4702" />
-<TGConnectingPoint num="5" id="4703" />
-<TGConnectingPoint num="6" id="4704" />
-<TGConnectingPoint num="7" id="4705" />
-<TGConnectingPoint num="8" id="4706" />
-<TGConnectingPoint num="9" id="4707" />
+<infoparam name="Send signal" value="chout(m5)" />
+<TGConnectingPoint num="0" id="6429" />
+<TGConnectingPoint num="1" id="6430" />
+<TGConnectingPoint num="2" id="6431" />
+<TGConnectingPoint num="3" id="6432" />
+<TGConnectingPoint num="4" id="6433" />
+<TGConnectingPoint num="5" id="6434" />
+<TGConnectingPoint num="6" id="6435" />
+<TGConnectingPoint num="7" id="6436" />
+<TGConnectingPoint num="8" id="6437" />
+<TGConnectingPoint num="9" id="6438" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="4749" >
-<cdparam x="483" y="1783" />
+<COMPONENT type="5106" id="6480" >
+<cdparam x="533" y="1944" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg4" />
-<TGConnectingPoint num="0" id="4709" />
-<TGConnectingPoint num="1" id="4710" />
-<TGConnectingPoint num="2" id="4711" />
-<TGConnectingPoint num="3" id="4712" />
-<TGConnectingPoint num="4" id="4713" />
-<TGConnectingPoint num="5" id="4714" />
-<TGConnectingPoint num="6" id="4715" />
-<TGConnectingPoint num="7" id="4716" />
-<TGConnectingPoint num="8" id="4717" />
-<TGConnectingPoint num="9" id="4718" />
-<TGConnectingPoint num="10" id="4719" />
-<TGConnectingPoint num="11" id="4720" />
-<TGConnectingPoint num="12" id="4721" />
-<TGConnectingPoint num="13" id="4722" />
-<TGConnectingPoint num="14" id="4723" />
-<TGConnectingPoint num="15" id="4724" />
-<TGConnectingPoint num="16" id="4725" />
-<TGConnectingPoint num="17" id="4726" />
-<TGConnectingPoint num="18" id="4727" />
-<TGConnectingPoint num="19" id="4728" />
-<TGConnectingPoint num="20" id="4729" />
-<TGConnectingPoint num="21" id="4730" />
-<TGConnectingPoint num="22" id="4731" />
-<TGConnectingPoint num="23" id="4732" />
-<TGConnectingPoint num="24" id="4733" />
-<TGConnectingPoint num="25" id="4734" />
-<TGConnectingPoint num="26" id="4735" />
-<TGConnectingPoint num="27" id="4736" />
-<TGConnectingPoint num="28" id="4737" />
-<TGConnectingPoint num="29" id="4738" />
-<TGConnectingPoint num="30" id="4739" />
-<TGConnectingPoint num="31" id="4740" />
-<TGConnectingPoint num="32" id="4741" />
-<TGConnectingPoint num="33" id="4742" />
-<TGConnectingPoint num="34" id="4743" />
-<TGConnectingPoint num="35" id="4744" />
-<TGConnectingPoint num="36" id="4745" />
-<TGConnectingPoint num="37" id="4746" />
-<TGConnectingPoint num="38" id="4747" />
-<TGConnectingPoint num="39" id="4748" />
+<infoparam name="state0" value="SendMsg5" />
+<TGConnectingPoint num="0" id="6440" />
+<TGConnectingPoint num="1" id="6441" />
+<TGConnectingPoint num="2" id="6442" />
+<TGConnectingPoint num="3" id="6443" />
+<TGConnectingPoint num="4" id="6444" />
+<TGConnectingPoint num="5" id="6445" />
+<TGConnectingPoint num="6" id="6446" />
+<TGConnectingPoint num="7" id="6447" />
+<TGConnectingPoint num="8" id="6448" />
+<TGConnectingPoint num="9" id="6449" />
+<TGConnectingPoint num="10" id="6450" />
+<TGConnectingPoint num="11" id="6451" />
+<TGConnectingPoint num="12" id="6452" />
+<TGConnectingPoint num="13" id="6453" />
+<TGConnectingPoint num="14" id="6454" />
+<TGConnectingPoint num="15" id="6455" />
+<TGConnectingPoint num="16" id="6456" />
+<TGConnectingPoint num="17" id="6457" />
+<TGConnectingPoint num="18" id="6458" />
+<TGConnectingPoint num="19" id="6459" />
+<TGConnectingPoint num="20" id="6460" />
+<TGConnectingPoint num="21" id="6461" />
+<TGConnectingPoint num="22" id="6462" />
+<TGConnectingPoint num="23" id="6463" />
+<TGConnectingPoint num="24" id="6464" />
+<TGConnectingPoint num="25" id="6465" />
+<TGConnectingPoint num="26" id="6466" />
+<TGConnectingPoint num="27" id="6467" />
+<TGConnectingPoint num="28" id="6468" />
+<TGConnectingPoint num="29" id="6469" />
+<TGConnectingPoint num="30" id="6470" />
+<TGConnectingPoint num="31" id="6471" />
+<TGConnectingPoint num="32" id="6472" />
+<TGConnectingPoint num="33" id="6473" />
+<TGConnectingPoint num="34" id="6474" />
+<TGConnectingPoint num="35" id="6475" />
+<TGConnectingPoint num="36" id="6476" />
+<TGConnectingPoint num="37" id="6477" />
+<TGConnectingPoint num="38" id="6478" />
+<TGConnectingPoint num="39" id="6479" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4790" >
-<cdparam x="470" y="1625" />
-<sizeparam width="124" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="6497" >
+<cdparam x="729" y="1779" />
+<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="AdoptSessionKey" />
-<TGConnectingPoint num="0" id="4750" />
-<TGConnectingPoint num="1" id="4751" />
-<TGConnectingPoint num="2" id="4752" />
-<TGConnectingPoint num="3" id="4753" />
-<TGConnectingPoint num="4" id="4754" />
-<TGConnectingPoint num="5" id="4755" />
-<TGConnectingPoint num="6" id="4756" />
-<TGConnectingPoint num="7" id="4757" />
-<TGConnectingPoint num="8" id="4758" />
-<TGConnectingPoint num="9" id="4759" />
-<TGConnectingPoint num="10" id="4760" />
-<TGConnectingPoint num="11" id="4761" />
-<TGConnectingPoint num="12" id="4762" />
-<TGConnectingPoint num="13" id="4763" />
-<TGConnectingPoint num="14" id="4764" />
-<TGConnectingPoint num="15" id="4765" />
-<TGConnectingPoint num="16" id="4766" />
-<TGConnectingPoint num="17" id="4767" />
-<TGConnectingPoint num="18" id="4768" />
-<TGConnectingPoint num="19" id="4769" />
-<TGConnectingPoint num="20" id="4770" />
-<TGConnectingPoint num="21" id="4771" />
-<TGConnectingPoint num="22" id="4772" />
-<TGConnectingPoint num="23" id="4773" />
-<TGConnectingPoint num="24" id="4774" />
-<TGConnectingPoint num="25" id="4775" />
-<TGConnectingPoint num="26" id="4776" />
-<TGConnectingPoint num="27" id="4777" />
-<TGConnectingPoint num="28" id="4778" />
-<TGConnectingPoint num="29" id="4779" />
-<TGConnectingPoint num="30" id="4780" />
-<TGConnectingPoint num="31" id="4781" />
-<TGConnectingPoint num="32" id="4782" />
-<TGConnectingPoint num="33" id="4783" />
-<TGConnectingPoint num="34" id="4784" />
-<TGConnectingPoint num="35" id="4785" />
-<TGConnectingPoint num="36" id="4786" />
-<TGConnectingPoint num="37" id="4787" />
-<TGConnectingPoint num="38" id="4788" />
-<TGConnectingPoint num="39" id="4789" />
+<infoparam name="UML Note" value="Encrypt secret data with new symmetric key
+" />
+<TGConnectingPoint num="0" id="6481" />
+<TGConnectingPoint num="1" id="6482" />
+<TGConnectingPoint num="2" id="6483" />
+<TGConnectingPoint num="3" id="6484" />
+<TGConnectingPoint num="4" id="6485" />
+<TGConnectingPoint num="5" id="6486" />
+<TGConnectingPoint num="6" id="6487" />
+<TGConnectingPoint num="7" id="6488" />
+<TGConnectingPoint num="8" id="6489" />
+<TGConnectingPoint num="9" id="6490" />
+<TGConnectingPoint num="10" id="6491" />
+<TGConnectingPoint num="11" id="6492" />
+<TGConnectingPoint num="12" id="6493" />
+<TGConnectingPoint num="13" id="6494" />
+<TGConnectingPoint num="14" id="6495" />
+<TGConnectingPoint num="15" id="6496" />
 <extraparam>
+<Line value="Encrypt secret data with new symmetric key" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4831" >
-<cdparam x="326" y="1623" />
+<COMPONENT type="5106" id="6538" >
+<cdparam x="543" y="1781" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig3" />
-<TGConnectingPoint num="0" id="4791" />
-<TGConnectingPoint num="1" id="4792" />
-<TGConnectingPoint num="2" id="4793" />
-<TGConnectingPoint num="3" id="4794" />
-<TGConnectingPoint num="4" id="4795" />
-<TGConnectingPoint num="5" id="4796" />
-<TGConnectingPoint num="6" id="4797" />
-<TGConnectingPoint num="7" id="4798" />
-<TGConnectingPoint num="8" id="4799" />
-<TGConnectingPoint num="9" id="4800" />
-<TGConnectingPoint num="10" id="4801" />
-<TGConnectingPoint num="11" id="4802" />
-<TGConnectingPoint num="12" id="4803" />
-<TGConnectingPoint num="13" id="4804" />
-<TGConnectingPoint num="14" id="4805" />
-<TGConnectingPoint num="15" id="4806" />
-<TGConnectingPoint num="16" id="4807" />
-<TGConnectingPoint num="17" id="4808" />
-<TGConnectingPoint num="18" id="4809" />
-<TGConnectingPoint num="19" id="4810" />
-<TGConnectingPoint num="20" id="4811" />
-<TGConnectingPoint num="21" id="4812" />
-<TGConnectingPoint num="22" id="4813" />
-<TGConnectingPoint num="23" id="4814" />
-<TGConnectingPoint num="24" id="4815" />
-<TGConnectingPoint num="25" id="4816" />
-<TGConnectingPoint num="26" id="4817" />
-<TGConnectingPoint num="27" id="4818" />
-<TGConnectingPoint num="28" id="4819" />
-<TGConnectingPoint num="29" id="4820" />
-<TGConnectingPoint num="30" id="4821" />
-<TGConnectingPoint num="31" id="4822" />
-<TGConnectingPoint num="32" id="4823" />
-<TGConnectingPoint num="33" id="4824" />
-<TGConnectingPoint num="34" id="4825" />
-<TGConnectingPoint num="35" id="4826" />
-<TGConnectingPoint num="36" id="4827" />
-<TGConnectingPoint num="37" id="4828" />
-<TGConnectingPoint num="38" id="4829" />
-<TGConnectingPoint num="39" id="4830" />
+<infoparam name="state0" value="ForgeMsg5" />
+<TGConnectingPoint num="0" id="6498" />
+<TGConnectingPoint num="1" id="6499" />
+<TGConnectingPoint num="2" id="6500" />
+<TGConnectingPoint num="3" id="6501" />
+<TGConnectingPoint num="4" id="6502" />
+<TGConnectingPoint num="5" id="6503" />
+<TGConnectingPoint num="6" id="6504" />
+<TGConnectingPoint num="7" id="6505" />
+<TGConnectingPoint num="8" id="6506" />
+<TGConnectingPoint num="9" id="6507" />
+<TGConnectingPoint num="10" id="6508" />
+<TGConnectingPoint num="11" id="6509" />
+<TGConnectingPoint num="12" id="6510" />
+<TGConnectingPoint num="13" id="6511" />
+<TGConnectingPoint num="14" id="6512" />
+<TGConnectingPoint num="15" id="6513" />
+<TGConnectingPoint num="16" id="6514" />
+<TGConnectingPoint num="17" id="6515" />
+<TGConnectingPoint num="18" id="6516" />
+<TGConnectingPoint num="19" id="6517" />
+<TGConnectingPoint num="20" id="6518" />
+<TGConnectingPoint num="21" id="6519" />
+<TGConnectingPoint num="22" id="6520" />
+<TGConnectingPoint num="23" id="6521" />
+<TGConnectingPoint num="24" id="6522" />
+<TGConnectingPoint num="25" id="6523" />
+<TGConnectingPoint num="26" id="6524" />
+<TGConnectingPoint num="27" id="6525" />
+<TGConnectingPoint num="28" id="6526" />
+<TGConnectingPoint num="29" id="6527" />
+<TGConnectingPoint num="30" id="6528" />
+<TGConnectingPoint num="31" id="6529" />
+<TGConnectingPoint num="32" id="6530" />
+<TGConnectingPoint num="33" id="6531" />
+<TGConnectingPoint num="34" id="6532" />
+<TGConnectingPoint num="35" id="6533" />
+<TGConnectingPoint num="36" id="6534" />
+<TGConnectingPoint num="37" id="6535" />
+<TGConnectingPoint num="38" id="6536" />
+<TGConnectingPoint num="39" id="6537" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4872" >
-<cdparam x="421" y="1506" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6579" >
+<cdparam x="371" y="1780" />
+<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig3" />
-<TGConnectingPoint num="0" id="4832" />
-<TGConnectingPoint num="1" id="4833" />
-<TGConnectingPoint num="2" id="4834" />
-<TGConnectingPoint num="3" id="4835" />
-<TGConnectingPoint num="4" id="4836" />
-<TGConnectingPoint num="5" id="4837" />
-<TGConnectingPoint num="6" id="4838" />
-<TGConnectingPoint num="7" id="4839" />
-<TGConnectingPoint num="8" id="4840" />
-<TGConnectingPoint num="9" id="4841" />
-<TGConnectingPoint num="10" id="4842" />
-<TGConnectingPoint num="11" id="4843" />
-<TGConnectingPoint num="12" id="4844" />
-<TGConnectingPoint num="13" id="4845" />
-<TGConnectingPoint num="14" id="4846" />
-<TGConnectingPoint num="15" id="4847" />
-<TGConnectingPoint num="16" id="4848" />
-<TGConnectingPoint num="17" id="4849" />
-<TGConnectingPoint num="18" id="4850" />
-<TGConnectingPoint num="19" id="4851" />
-<TGConnectingPoint num="20" id="4852" />
-<TGConnectingPoint num="21" id="4853" />
-<TGConnectingPoint num="22" id="4854" />
-<TGConnectingPoint num="23" id="4855" />
-<TGConnectingPoint num="24" id="4856" />
-<TGConnectingPoint num="25" id="4857" />
-<TGConnectingPoint num="26" id="4858" />
-<TGConnectingPoint num="27" id="4859" />
-<TGConnectingPoint num="28" id="4860" />
-<TGConnectingPoint num="29" id="4861" />
-<TGConnectingPoint num="30" id="4862" />
-<TGConnectingPoint num="31" id="4863" />
-<TGConnectingPoint num="32" id="4864" />
-<TGConnectingPoint num="33" id="4865" />
-<TGConnectingPoint num="34" id="4866" />
-<TGConnectingPoint num="35" id="4867" />
-<TGConnectingPoint num="36" id="4868" />
-<TGConnectingPoint num="37" id="4869" />
-<TGConnectingPoint num="38" id="4870" />
-<TGConnectingPoint num="39" id="4871" />
+<infoparam name="state0" value="UnexpectedMsg4" />
+<TGConnectingPoint num="0" id="6539" />
+<TGConnectingPoint num="1" id="6540" />
+<TGConnectingPoint num="2" id="6541" />
+<TGConnectingPoint num="3" id="6542" />
+<TGConnectingPoint num="4" id="6543" />
+<TGConnectingPoint num="5" id="6544" />
+<TGConnectingPoint num="6" id="6545" />
+<TGConnectingPoint num="7" id="6546" />
+<TGConnectingPoint num="8" id="6547" />
+<TGConnectingPoint num="9" id="6548" />
+<TGConnectingPoint num="10" id="6549" />
+<TGConnectingPoint num="11" id="6550" />
+<TGConnectingPoint num="12" id="6551" />
+<TGConnectingPoint num="13" id="6552" />
+<TGConnectingPoint num="14" id="6553" />
+<TGConnectingPoint num="15" id="6554" />
+<TGConnectingPoint num="16" id="6555" />
+<TGConnectingPoint num="17" id="6556" />
+<TGConnectingPoint num="18" id="6557" />
+<TGConnectingPoint num="19" id="6558" />
+<TGConnectingPoint num="20" id="6559" />
+<TGConnectingPoint num="21" id="6560" />
+<TGConnectingPoint num="22" id="6561" />
+<TGConnectingPoint num="23" id="6562" />
+<TGConnectingPoint num="24" id="6563" />
+<TGConnectingPoint num="25" id="6564" />
+<TGConnectingPoint num="26" id="6565" />
+<TGConnectingPoint num="27" id="6566" />
+<TGConnectingPoint num="28" id="6567" />
+<TGConnectingPoint num="29" id="6568" />
+<TGConnectingPoint num="30" id="6569" />
+<TGConnectingPoint num="31" id="6570" />
+<TGConnectingPoint num="32" id="6571" />
+<TGConnectingPoint num="33" id="6572" />
+<TGConnectingPoint num="34" id="6573" />
+<TGConnectingPoint num="35" id="6574" />
+<TGConnectingPoint num="36" id="6575" />
+<TGConnectingPoint num="37" id="6576" />
+<TGConnectingPoint num="38" id="6577" />
+<TGConnectingPoint num="39" id="6578" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4913" >
-<cdparam x="264" y="1507" />
+<COMPONENT type="5106" id="6620" >
+<cdparam x="484" y="1674" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts3" />
-<TGConnectingPoint num="0" id="4873" />
-<TGConnectingPoint num="1" id="4874" />
-<TGConnectingPoint num="2" id="4875" />
-<TGConnectingPoint num="3" id="4876" />
-<TGConnectingPoint num="4" id="4877" />
-<TGConnectingPoint num="5" id="4878" />
-<TGConnectingPoint num="6" id="4879" />
-<TGConnectingPoint num="7" id="4880" />
-<TGConnectingPoint num="8" id="4881" />
-<TGConnectingPoint num="9" id="4882" />
-<TGConnectingPoint num="10" id="4883" />
-<TGConnectingPoint num="11" id="4884" />
-<TGConnectingPoint num="12" id="4885" />
-<TGConnectingPoint num="13" id="4886" />
-<TGConnectingPoint num="14" id="4887" />
-<TGConnectingPoint num="15" id="4888" />
-<TGConnectingPoint num="16" id="4889" />
-<TGConnectingPoint num="17" id="4890" />
-<TGConnectingPoint num="18" id="4891" />
-<TGConnectingPoint num="19" id="4892" />
-<TGConnectingPoint num="20" id="4893" />
-<TGConnectingPoint num="21" id="4894" />
-<TGConnectingPoint num="22" id="4895" />
-<TGConnectingPoint num="23" id="4896" />
-<TGConnectingPoint num="24" id="4897" />
-<TGConnectingPoint num="25" id="4898" />
-<TGConnectingPoint num="26" id="4899" />
-<TGConnectingPoint num="27" id="4900" />
-<TGConnectingPoint num="28" id="4901" />
-<TGConnectingPoint num="29" id="4902" />
-<TGConnectingPoint num="30" id="4903" />
-<TGConnectingPoint num="31" id="4904" />
-<TGConnectingPoint num="32" id="4905" />
-<TGConnectingPoint num="33" id="4906" />
-<TGConnectingPoint num="34" id="4907" />
-<TGConnectingPoint num="35" id="4908" />
-<TGConnectingPoint num="36" id="4909" />
-<TGConnectingPoint num="37" id="4910" />
-<TGConnectingPoint num="38" id="4911" />
-<TGConnectingPoint num="39" id="4912" />
+<infoparam name="state0" value="Verifyack4" />
+<TGConnectingPoint num="0" id="6580" />
+<TGConnectingPoint num="1" id="6581" />
+<TGConnectingPoint num="2" id="6582" />
+<TGConnectingPoint num="3" id="6583" />
+<TGConnectingPoint num="4" id="6584" />
+<TGConnectingPoint num="5" id="6585" />
+<TGConnectingPoint num="6" id="6586" />
+<TGConnectingPoint num="7" id="6587" />
+<TGConnectingPoint num="8" id="6588" />
+<TGConnectingPoint num="9" id="6589" />
+<TGConnectingPoint num="10" id="6590" />
+<TGConnectingPoint num="11" id="6591" />
+<TGConnectingPoint num="12" id="6592" />
+<TGConnectingPoint num="13" id="6593" />
+<TGConnectingPoint num="14" id="6594" />
+<TGConnectingPoint num="15" id="6595" />
+<TGConnectingPoint num="16" id="6596" />
+<TGConnectingPoint num="17" id="6597" />
+<TGConnectingPoint num="18" id="6598" />
+<TGConnectingPoint num="19" id="6599" />
+<TGConnectingPoint num="20" id="6600" />
+<TGConnectingPoint num="21" id="6601" />
+<TGConnectingPoint num="22" id="6602" />
+<TGConnectingPoint num="23" id="6603" />
+<TGConnectingPoint num="24" id="6604" />
+<TGConnectingPoint num="25" id="6605" />
+<TGConnectingPoint num="26" id="6606" />
+<TGConnectingPoint num="27" id="6607" />
+<TGConnectingPoint num="28" id="6608" />
+<TGConnectingPoint num="29" id="6609" />
+<TGConnectingPoint num="30" id="6610" />
+<TGConnectingPoint num="31" id="6611" />
+<TGConnectingPoint num="32" id="6612" />
+<TGConnectingPoint num="33" id="6613" />
+<TGConnectingPoint num="34" id="6614" />
+<TGConnectingPoint num="35" id="6615" />
+<TGConnectingPoint num="36" id="6616" />
+<TGConnectingPoint num="37" id="6617" />
+<TGConnectingPoint num="38" id="6618" />
+<TGConnectingPoint num="39" id="6619" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="4954" >
-<cdparam x="356" y="1402" />
+<COMPONENT type="5106" id="6661" >
+<cdparam x="306" y="1673" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts3" />
-<TGConnectingPoint num="0" id="4914" />
-<TGConnectingPoint num="1" id="4915" />
-<TGConnectingPoint num="2" id="4916" />
-<TGConnectingPoint num="3" id="4917" />
-<TGConnectingPoint num="4" id="4918" />
-<TGConnectingPoint num="5" id="4919" />
-<TGConnectingPoint num="6" id="4920" />
-<TGConnectingPoint num="7" id="4921" />
-<TGConnectingPoint num="8" id="4922" />
-<TGConnectingPoint num="9" id="4923" />
-<TGConnectingPoint num="10" id="4924" />
-<TGConnectingPoint num="11" id="4925" />
-<TGConnectingPoint num="12" id="4926" />
-<TGConnectingPoint num="13" id="4927" />
-<TGConnectingPoint num="14" id="4928" />
-<TGConnectingPoint num="15" id="4929" />
-<TGConnectingPoint num="16" id="4930" />
-<TGConnectingPoint num="17" id="4931" />
-<TGConnectingPoint num="18" id="4932" />
-<TGConnectingPoint num="19" id="4933" />
-<TGConnectingPoint num="20" id="4934" />
-<TGConnectingPoint num="21" id="4935" />
-<TGConnectingPoint num="22" id="4936" />
-<TGConnectingPoint num="23" id="4937" />
-<TGConnectingPoint num="24" id="4938" />
-<TGConnectingPoint num="25" id="4939" />
-<TGConnectingPoint num="26" id="4940" />
-<TGConnectingPoint num="27" id="4941" />
-<TGConnectingPoint num="28" id="4942" />
-<TGConnectingPoint num="29" id="4943" />
-<TGConnectingPoint num="30" id="4944" />
-<TGConnectingPoint num="31" id="4945" />
-<TGConnectingPoint num="32" id="4946" />
-<TGConnectingPoint num="33" id="4947" />
-<TGConnectingPoint num="34" id="4948" />
-<TGConnectingPoint num="35" id="4949" />
-<TGConnectingPoint num="36" id="4950" />
-<TGConnectingPoint num="37" id="4951" />
-<TGConnectingPoint num="38" id="4952" />
-<TGConnectingPoint num="39" id="4953" />
+<infoparam name="state0" value="InvalidSig4" />
+<TGConnectingPoint num="0" id="6621" />
+<TGConnectingPoint num="1" id="6622" />
+<TGConnectingPoint num="2" id="6623" />
+<TGConnectingPoint num="3" id="6624" />
+<TGConnectingPoint num="4" id="6625" />
+<TGConnectingPoint num="5" id="6626" />
+<TGConnectingPoint num="6" id="6627" />
+<TGConnectingPoint num="7" id="6628" />
+<TGConnectingPoint num="8" id="6629" />
+<TGConnectingPoint num="9" id="6630" />
+<TGConnectingPoint num="10" id="6631" />
+<TGConnectingPoint num="11" id="6632" />
+<TGConnectingPoint num="12" id="6633" />
+<TGConnectingPoint num="13" id="6634" />
+<TGConnectingPoint num="14" id="6635" />
+<TGConnectingPoint num="15" id="6636" />
+<TGConnectingPoint num="16" id="6637" />
+<TGConnectingPoint num="17" id="6638" />
+<TGConnectingPoint num="18" id="6639" />
+<TGConnectingPoint num="19" id="6640" />
+<TGConnectingPoint num="20" id="6641" />
+<TGConnectingPoint num="21" id="6642" />
+<TGConnectingPoint num="22" id="6643" />
+<TGConnectingPoint num="23" id="6644" />
+<TGConnectingPoint num="24" id="6645" />
+<TGConnectingPoint num="25" id="6646" />
+<TGConnectingPoint num="26" id="6647" />
+<TGConnectingPoint num="27" id="6648" />
+<TGConnectingPoint num="28" id="6649" />
+<TGConnectingPoint num="29" id="6650" />
+<TGConnectingPoint num="30" id="6651" />
+<TGConnectingPoint num="31" id="6652" />
+<TGConnectingPoint num="32" id="6653" />
+<TGConnectingPoint num="33" id="6654" />
+<TGConnectingPoint num="34" id="6655" />
+<TGConnectingPoint num="35" id="6656" />
+<TGConnectingPoint num="36" id="6657" />
+<TGConnectingPoint num="37" id="6658" />
+<TGConnectingPoint num="38" id="6659" />
+<TGConnectingPoint num="39" id="6660" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="4965" >
-<cdparam x="378" y="1316" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6702" >
+<cdparam x="429" y="1583" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m3)" />
-<TGConnectingPoint num="0" id="4955" />
-<TGConnectingPoint num="1" id="4956" />
-<TGConnectingPoint num="2" id="4957" />
-<TGConnectingPoint num="3" id="4958" />
-<TGConnectingPoint num="4" id="4959" />
-<TGConnectingPoint num="5" id="4960" />
-<TGConnectingPoint num="6" id="4961" />
-<TGConnectingPoint num="7" id="4962" />
-<TGConnectingPoint num="8" id="4963" />
-<TGConnectingPoint num="9" id="4964" />
+<infoparam name="state0" value="VerifySig4" />
+<TGConnectingPoint num="0" id="6662" />
+<TGConnectingPoint num="1" id="6663" />
+<TGConnectingPoint num="2" id="6664" />
+<TGConnectingPoint num="3" id="6665" />
+<TGConnectingPoint num="4" id="6666" />
+<TGConnectingPoint num="5" id="6667" />
+<TGConnectingPoint num="6" id="6668" />
+<TGConnectingPoint num="7" id="6669" />
+<TGConnectingPoint num="8" id="6670" />
+<TGConnectingPoint num="9" id="6671" />
+<TGConnectingPoint num="10" id="6672" />
+<TGConnectingPoint num="11" id="6673" />
+<TGConnectingPoint num="12" id="6674" />
+<TGConnectingPoint num="13" id="6675" />
+<TGConnectingPoint num="14" id="6676" />
+<TGConnectingPoint num="15" id="6677" />
+<TGConnectingPoint num="16" id="6678" />
+<TGConnectingPoint num="17" id="6679" />
+<TGConnectingPoint num="18" id="6680" />
+<TGConnectingPoint num="19" id="6681" />
+<TGConnectingPoint num="20" id="6682" />
+<TGConnectingPoint num="21" id="6683" />
+<TGConnectingPoint num="22" id="6684" />
+<TGConnectingPoint num="23" id="6685" />
+<TGConnectingPoint num="24" id="6686" />
+<TGConnectingPoint num="25" id="6687" />
+<TGConnectingPoint num="26" id="6688" />
+<TGConnectingPoint num="27" id="6689" />
+<TGConnectingPoint num="28" id="6690" />
+<TGConnectingPoint num="29" id="6691" />
+<TGConnectingPoint num="30" id="6692" />
+<TGConnectingPoint num="31" id="6693" />
+<TGConnectingPoint num="32" id="6694" />
+<TGConnectingPoint num="33" id="6695" />
+<TGConnectingPoint num="34" id="6696" />
+<TGConnectingPoint num="35" id="6697" />
+<TGConnectingPoint num="36" id="6698" />
+<TGConnectingPoint num="37" id="6699" />
+<TGConnectingPoint num="38" id="6700" />
+<TGConnectingPoint num="39" id="6701" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="4982" >
-<cdparam x="556" y="1246" />
-<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6743" >
+<cdparam x="227" y="1579" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Verify Message with session key from ECU1
-" />
-<TGConnectingPoint num="0" id="4966" />
-<TGConnectingPoint num="1" id="4967" />
-<TGConnectingPoint num="2" id="4968" />
-<TGConnectingPoint num="3" id="4969" />
-<TGConnectingPoint num="4" id="4970" />
-<TGConnectingPoint num="5" id="4971" />
-<TGConnectingPoint num="6" id="4972" />
-<TGConnectingPoint num="7" id="4973" />
-<TGConnectingPoint num="8" id="4974" />
-<TGConnectingPoint num="9" id="4975" />
-<TGConnectingPoint num="10" id="4976" />
-<TGConnectingPoint num="11" id="4977" />
-<TGConnectingPoint num="12" id="4978" />
-<TGConnectingPoint num="13" id="4979" />
-<TGConnectingPoint num="14" id="4980" />
-<TGConnectingPoint num="15" id="4981" />
+<infoparam name="state0" value="Invalidts4" />
+<TGConnectingPoint num="0" id="6703" />
+<TGConnectingPoint num="1" id="6704" />
+<TGConnectingPoint num="2" id="6705" />
+<TGConnectingPoint num="3" id="6706" />
+<TGConnectingPoint num="4" id="6707" />
+<TGConnectingPoint num="5" id="6708" />
+<TGConnectingPoint num="6" id="6709" />
+<TGConnectingPoint num="7" id="6710" />
+<TGConnectingPoint num="8" id="6711" />
+<TGConnectingPoint num="9" id="6712" />
+<TGConnectingPoint num="10" id="6713" />
+<TGConnectingPoint num="11" id="6714" />
+<TGConnectingPoint num="12" id="6715" />
+<TGConnectingPoint num="13" id="6716" />
+<TGConnectingPoint num="14" id="6717" />
+<TGConnectingPoint num="15" id="6718" />
+<TGConnectingPoint num="16" id="6719" />
+<TGConnectingPoint num="17" id="6720" />
+<TGConnectingPoint num="18" id="6721" />
+<TGConnectingPoint num="19" id="6722" />
+<TGConnectingPoint num="20" id="6723" />
+<TGConnectingPoint num="21" id="6724" />
+<TGConnectingPoint num="22" id="6725" />
+<TGConnectingPoint num="23" id="6726" />
+<TGConnectingPoint num="24" id="6727" />
+<TGConnectingPoint num="25" id="6728" />
+<TGConnectingPoint num="26" id="6729" />
+<TGConnectingPoint num="27" id="6730" />
+<TGConnectingPoint num="28" id="6731" />
+<TGConnectingPoint num="29" id="6732" />
+<TGConnectingPoint num="30" id="6733" />
+<TGConnectingPoint num="31" id="6734" />
+<TGConnectingPoint num="32" id="6735" />
+<TGConnectingPoint num="33" id="6736" />
+<TGConnectingPoint num="34" id="6737" />
+<TGConnectingPoint num="35" id="6738" />
+<TGConnectingPoint num="36" id="6739" />
+<TGConnectingPoint num="37" id="6740" />
+<TGConnectingPoint num="38" id="6741" />
+<TGConnectingPoint num="39" id="6742" />
 <extraparam>
-<Line value="Verify Message with session key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5023" >
-<cdparam x="375" y="1247" />
+<COMPONENT type="5106" id="6784" >
+<cdparam x="350" y="1491" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg3" />
-<TGConnectingPoint num="0" id="4983" />
-<TGConnectingPoint num="1" id="4984" />
-<TGConnectingPoint num="2" id="4985" />
-<TGConnectingPoint num="3" id="4986" />
-<TGConnectingPoint num="4" id="4987" />
-<TGConnectingPoint num="5" id="4988" />
-<TGConnectingPoint num="6" id="4989" />
-<TGConnectingPoint num="7" id="4990" />
-<TGConnectingPoint num="8" id="4991" />
-<TGConnectingPoint num="9" id="4992" />
-<TGConnectingPoint num="10" id="4993" />
-<TGConnectingPoint num="11" id="4994" />
-<TGConnectingPoint num="12" id="4995" />
-<TGConnectingPoint num="13" id="4996" />
-<TGConnectingPoint num="14" id="4997" />
-<TGConnectingPoint num="15" id="4998" />
-<TGConnectingPoint num="16" id="4999" />
-<TGConnectingPoint num="17" id="5000" />
-<TGConnectingPoint num="18" id="5001" />
-<TGConnectingPoint num="19" id="5002" />
-<TGConnectingPoint num="20" id="5003" />
-<TGConnectingPoint num="21" id="5004" />
-<TGConnectingPoint num="22" id="5005" />
-<TGConnectingPoint num="23" id="5006" />
-<TGConnectingPoint num="24" id="5007" />
-<TGConnectingPoint num="25" id="5008" />
-<TGConnectingPoint num="26" id="5009" />
-<TGConnectingPoint num="27" id="5010" />
-<TGConnectingPoint num="28" id="5011" />
-<TGConnectingPoint num="29" id="5012" />
-<TGConnectingPoint num="30" id="5013" />
-<TGConnectingPoint num="31" id="5014" />
-<TGConnectingPoint num="32" id="5015" />
-<TGConnectingPoint num="33" id="5016" />
-<TGConnectingPoint num="34" id="5017" />
-<TGConnectingPoint num="35" id="5018" />
-<TGConnectingPoint num="36" id="5019" />
-<TGConnectingPoint num="37" id="5020" />
-<TGConnectingPoint num="38" id="5021" />
-<TGConnectingPoint num="39" id="5022" />
+<infoparam name="state0" value="Testts4" />
+<TGConnectingPoint num="0" id="6744" />
+<TGConnectingPoint num="1" id="6745" />
+<TGConnectingPoint num="2" id="6746" />
+<TGConnectingPoint num="3" id="6747" />
+<TGConnectingPoint num="4" id="6748" />
+<TGConnectingPoint num="5" id="6749" />
+<TGConnectingPoint num="6" id="6750" />
+<TGConnectingPoint num="7" id="6751" />
+<TGConnectingPoint num="8" id="6752" />
+<TGConnectingPoint num="9" id="6753" />
+<TGConnectingPoint num="10" id="6754" />
+<TGConnectingPoint num="11" id="6755" />
+<TGConnectingPoint num="12" id="6756" />
+<TGConnectingPoint num="13" id="6757" />
+<TGConnectingPoint num="14" id="6758" />
+<TGConnectingPoint num="15" id="6759" />
+<TGConnectingPoint num="16" id="6760" />
+<TGConnectingPoint num="17" id="6761" />
+<TGConnectingPoint num="18" id="6762" />
+<TGConnectingPoint num="19" id="6763" />
+<TGConnectingPoint num="20" id="6764" />
+<TGConnectingPoint num="21" id="6765" />
+<TGConnectingPoint num="22" id="6766" />
+<TGConnectingPoint num="23" id="6767" />
+<TGConnectingPoint num="24" id="6768" />
+<TGConnectingPoint num="25" id="6769" />
+<TGConnectingPoint num="26" id="6770" />
+<TGConnectingPoint num="27" id="6771" />
+<TGConnectingPoint num="28" id="6772" />
+<TGConnectingPoint num="29" id="6773" />
+<TGConnectingPoint num="30" id="6774" />
+<TGConnectingPoint num="31" id="6775" />
+<TGConnectingPoint num="32" id="6776" />
+<TGConnectingPoint num="33" id="6777" />
+<TGConnectingPoint num="34" id="6778" />
+<TGConnectingPoint num="35" id="6779" />
+<TGConnectingPoint num="36" id="6780" />
+<TGConnectingPoint num="37" id="6781" />
+<TGConnectingPoint num="38" id="6782" />
+<TGConnectingPoint num="39" id="6783" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="5034" >
-<cdparam x="400" y="1197" />
+<COMPONENT type="5104" id="6795" >
+<cdparam x="356" y="1410" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Send signal" value="chout(m2)" />
-<TGConnectingPoint num="0" id="5024" />
-<TGConnectingPoint num="1" id="5025" />
-<TGConnectingPoint num="2" id="5026" />
-<TGConnectingPoint num="3" id="5027" />
-<TGConnectingPoint num="4" id="5028" />
-<TGConnectingPoint num="5" id="5029" />
-<TGConnectingPoint num="6" id="5030" />
-<TGConnectingPoint num="7" id="5031" />
-<TGConnectingPoint num="8" id="5032" />
-<TGConnectingPoint num="9" id="5033" />
+<infoparam name="Receive signal" value="chin(m4)" />
+<TGConnectingPoint num="0" id="6785" />
+<TGConnectingPoint num="1" id="6786" />
+<TGConnectingPoint num="2" id="6787" />
+<TGConnectingPoint num="3" id="6788" />
+<TGConnectingPoint num="4" id="6789" />
+<TGConnectingPoint num="5" id="6790" />
+<TGConnectingPoint num="6" id="6791" />
+<TGConnectingPoint num="7" id="6792" />
+<TGConnectingPoint num="8" id="6793" />
+<TGConnectingPoint num="9" id="6794" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="5075" >
-<cdparam x="379" y="1137" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="6812" >
+<cdparam x="557" y="1318" />
+<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg2" />
-<TGConnectingPoint num="0" id="5035" />
-<TGConnectingPoint num="1" id="5036" />
-<TGConnectingPoint num="2" id="5037" />
-<TGConnectingPoint num="3" id="5038" />
-<TGConnectingPoint num="4" id="5039" />
-<TGConnectingPoint num="5" id="5040" />
-<TGConnectingPoint num="6" id="5041" />
-<TGConnectingPoint num="7" id="5042" />
-<TGConnectingPoint num="8" id="5043" />
-<TGConnectingPoint num="9" id="5044" />
-<TGConnectingPoint num="10" id="5045" />
-<TGConnectingPoint num="11" id="5046" />
-<TGConnectingPoint num="12" id="5047" />
-<TGConnectingPoint num="13" id="5048" />
-<TGConnectingPoint num="14" id="5049" />
-<TGConnectingPoint num="15" id="5050" />
-<TGConnectingPoint num="16" id="5051" />
-<TGConnectingPoint num="17" id="5052" />
-<TGConnectingPoint num="18" id="5053" />
-<TGConnectingPoint num="19" id="5054" />
-<TGConnectingPoint num="20" id="5055" />
-<TGConnectingPoint num="21" id="5056" />
-<TGConnectingPoint num="22" id="5057" />
-<TGConnectingPoint num="23" id="5058" />
-<TGConnectingPoint num="24" id="5059" />
-<TGConnectingPoint num="25" id="5060" />
-<TGConnectingPoint num="26" id="5061" />
-<TGConnectingPoint num="27" id="5062" />
-<TGConnectingPoint num="28" id="5063" />
-<TGConnectingPoint num="29" id="5064" />
-<TGConnectingPoint num="30" id="5065" />
-<TGConnectingPoint num="31" id="5066" />
-<TGConnectingPoint num="32" id="5067" />
-<TGConnectingPoint num="33" id="5068" />
-<TGConnectingPoint num="34" id="5069" />
-<TGConnectingPoint num="35" id="5070" />
-<TGConnectingPoint num="36" id="5071" />
-<TGConnectingPoint num="37" id="5072" />
-<TGConnectingPoint num="38" id="5073" />
-<TGConnectingPoint num="39" id="5074" />
+<infoparam name="UML Note" value="Receive and verify ack-message from ECU2
+" />
+<TGConnectingPoint num="0" id="6796" />
+<TGConnectingPoint num="1" id="6797" />
+<TGConnectingPoint num="2" id="6798" />
+<TGConnectingPoint num="3" id="6799" />
+<TGConnectingPoint num="4" id="6800" />
+<TGConnectingPoint num="5" id="6801" />
+<TGConnectingPoint num="6" id="6802" />
+<TGConnectingPoint num="7" id="6803" />
+<TGConnectingPoint num="8" id="6804" />
+<TGConnectingPoint num="9" id="6805" />
+<TGConnectingPoint num="10" id="6806" />
+<TGConnectingPoint num="11" id="6807" />
+<TGConnectingPoint num="12" id="6808" />
+<TGConnectingPoint num="13" id="6809" />
+<TGConnectingPoint num="14" id="6810" />
+<TGConnectingPoint num="15" id="6811" />
 <extraparam>
+<Line value="Receive and verify ack-message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="5092" >
-<cdparam x="546" y="983" />
-<sizeparam width="342" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6853" >
+<cdparam x="349" y="1324" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create and send answer for ECU1: Certified pk of ECU2
-" />
-<TGConnectingPoint num="0" id="5076" />
-<TGConnectingPoint num="1" id="5077" />
-<TGConnectingPoint num="2" id="5078" />
-<TGConnectingPoint num="3" id="5079" />
-<TGConnectingPoint num="4" id="5080" />
-<TGConnectingPoint num="5" id="5081" />
-<TGConnectingPoint num="6" id="5082" />
-<TGConnectingPoint num="7" id="5083" />
-<TGConnectingPoint num="8" id="5084" />
-<TGConnectingPoint num="9" id="5085" />
-<TGConnectingPoint num="10" id="5086" />
-<TGConnectingPoint num="11" id="5087" />
-<TGConnectingPoint num="12" id="5088" />
-<TGConnectingPoint num="13" id="5089" />
-<TGConnectingPoint num="14" id="5090" />
-<TGConnectingPoint num="15" id="5091" />
+<infoparam name="state0" value="WaitForMsg4" />
+<TGConnectingPoint num="0" id="6813" />
+<TGConnectingPoint num="1" id="6814" />
+<TGConnectingPoint num="2" id="6815" />
+<TGConnectingPoint num="3" id="6816" />
+<TGConnectingPoint num="4" id="6817" />
+<TGConnectingPoint num="5" id="6818" />
+<TGConnectingPoint num="6" id="6819" />
+<TGConnectingPoint num="7" id="6820" />
+<TGConnectingPoint num="8" id="6821" />
+<TGConnectingPoint num="9" id="6822" />
+<TGConnectingPoint num="10" id="6823" />
+<TGConnectingPoint num="11" id="6824" />
+<TGConnectingPoint num="12" id="6825" />
+<TGConnectingPoint num="13" id="6826" />
+<TGConnectingPoint num="14" id="6827" />
+<TGConnectingPoint num="15" id="6828" />
+<TGConnectingPoint num="16" id="6829" />
+<TGConnectingPoint num="17" id="6830" />
+<TGConnectingPoint num="18" id="6831" />
+<TGConnectingPoint num="19" id="6832" />
+<TGConnectingPoint num="20" id="6833" />
+<TGConnectingPoint num="21" id="6834" />
+<TGConnectingPoint num="22" id="6835" />
+<TGConnectingPoint num="23" id="6836" />
+<TGConnectingPoint num="24" id="6837" />
+<TGConnectingPoint num="25" id="6838" />
+<TGConnectingPoint num="26" id="6839" />
+<TGConnectingPoint num="27" id="6840" />
+<TGConnectingPoint num="28" id="6841" />
+<TGConnectingPoint num="29" id="6842" />
+<TGConnectingPoint num="30" id="6843" />
+<TGConnectingPoint num="31" id="6844" />
+<TGConnectingPoint num="32" id="6845" />
+<TGConnectingPoint num="33" id="6846" />
+<TGConnectingPoint num="34" id="6847" />
+<TGConnectingPoint num="35" id="6848" />
+<TGConnectingPoint num="36" id="6849" />
+<TGConnectingPoint num="37" id="6850" />
+<TGConnectingPoint num="38" id="6851" />
+<TGConnectingPoint num="39" id="6852" />
 <extraparam>
-<Line value="Create and send answer for ECU1: Certified pk of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="5109" >
-<cdparam x="453" y="555" />
-<sizeparam width="324" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="6864" >
+<cdparam x="358" y="1262" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="UML Note" value="Begin verifying m1: PK-Request message from ECU1
-" />
-<TGConnectingPoint num="0" id="5093" />
-<TGConnectingPoint num="1" id="5094" />
-<TGConnectingPoint num="2" id="5095" />
-<TGConnectingPoint num="3" id="5096" />
-<TGConnectingPoint num="4" id="5097" />
-<TGConnectingPoint num="5" id="5098" />
-<TGConnectingPoint num="6" id="5099" />
-<TGConnectingPoint num="7" id="5100" />
-<TGConnectingPoint num="8" id="5101" />
-<TGConnectingPoint num="9" id="5102" />
-<TGConnectingPoint num="10" id="5103" />
-<TGConnectingPoint num="11" id="5104" />
-<TGConnectingPoint num="12" id="5105" />
-<TGConnectingPoint num="13" id="5106" />
-<TGConnectingPoint num="14" id="5107" />
-<TGConnectingPoint num="15" id="5108" />
-<extraparam>
-<Line value="Begin verifying m1: PK-Request message from ECU1" />
-</extraparam>
+<infoparam name="Send signal" value="chout(m3)" />
+<TGConnectingPoint num="0" id="6854" />
+<TGConnectingPoint num="1" id="6855" />
+<TGConnectingPoint num="2" id="6856" />
+<TGConnectingPoint num="3" id="6857" />
+<TGConnectingPoint num="4" id="6858" />
+<TGConnectingPoint num="5" id="6859" />
+<TGConnectingPoint num="6" id="6860" />
+<TGConnectingPoint num="7" id="6861" />
+<TGConnectingPoint num="8" id="6862" />
+<TGConnectingPoint num="9" id="6863" />
 </COMPONENT>
 
-<COMPONENT type="301" id="5126" >
-<cdparam x="272" y="66" />
-<sizeparam width="310" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="6905" >
+<cdparam x="335" y="1185" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Begin verifying m0: certified public key from ECU1
-" />
-<TGConnectingPoint num="0" id="5110" />
-<TGConnectingPoint num="1" id="5111" />
-<TGConnectingPoint num="2" id="5112" />
-<TGConnectingPoint num="3" id="5113" />
-<TGConnectingPoint num="4" id="5114" />
-<TGConnectingPoint num="5" id="5115" />
-<TGConnectingPoint num="6" id="5116" />
-<TGConnectingPoint num="7" id="5117" />
-<TGConnectingPoint num="8" id="5118" />
-<TGConnectingPoint num="9" id="5119" />
-<TGConnectingPoint num="10" id="5120" />
-<TGConnectingPoint num="11" id="5121" />
-<TGConnectingPoint num="12" id="5122" />
-<TGConnectingPoint num="13" id="5123" />
-<TGConnectingPoint num="14" id="5124" />
-<TGConnectingPoint num="15" id="5125" />
+<infoparam name="state0" value="SendMsg3" />
+<TGConnectingPoint num="0" id="6865" />
+<TGConnectingPoint num="1" id="6866" />
+<TGConnectingPoint num="2" id="6867" />
+<TGConnectingPoint num="3" id="6868" />
+<TGConnectingPoint num="4" id="6869" />
+<TGConnectingPoint num="5" id="6870" />
+<TGConnectingPoint num="6" id="6871" />
+<TGConnectingPoint num="7" id="6872" />
+<TGConnectingPoint num="8" id="6873" />
+<TGConnectingPoint num="9" id="6874" />
+<TGConnectingPoint num="10" id="6875" />
+<TGConnectingPoint num="11" id="6876" />
+<TGConnectingPoint num="12" id="6877" />
+<TGConnectingPoint num="13" id="6878" />
+<TGConnectingPoint num="14" id="6879" />
+<TGConnectingPoint num="15" id="6880" />
+<TGConnectingPoint num="16" id="6881" />
+<TGConnectingPoint num="17" id="6882" />
+<TGConnectingPoint num="18" id="6883" />
+<TGConnectingPoint num="19" id="6884" />
+<TGConnectingPoint num="20" id="6885" />
+<TGConnectingPoint num="21" id="6886" />
+<TGConnectingPoint num="22" id="6887" />
+<TGConnectingPoint num="23" id="6888" />
+<TGConnectingPoint num="24" id="6889" />
+<TGConnectingPoint num="25" id="6890" />
+<TGConnectingPoint num="26" id="6891" />
+<TGConnectingPoint num="27" id="6892" />
+<TGConnectingPoint num="28" id="6893" />
+<TGConnectingPoint num="29" id="6894" />
+<TGConnectingPoint num="30" id="6895" />
+<TGConnectingPoint num="31" id="6896" />
+<TGConnectingPoint num="32" id="6897" />
+<TGConnectingPoint num="33" id="6898" />
+<TGConnectingPoint num="34" id="6899" />
+<TGConnectingPoint num="35" id="6900" />
+<TGConnectingPoint num="36" id="6901" />
+<TGConnectingPoint num="37" id="6902" />
+<TGConnectingPoint num="38" id="6903" />
+<TGConnectingPoint num="39" id="6904" />
 <extraparam>
-<Line value="Begin verifying m0: certified public key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5167" >
-<cdparam x="384" y="978" />
+<COMPONENT type="301" id="6922" >
+<cdparam x="526" y="1019" />
+<sizeparam width="414" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="UML Note" value="Create and send m3, message containing the encrypted session key
+" />
+<TGConnectingPoint num="0" id="6906" />
+<TGConnectingPoint num="1" id="6907" />
+<TGConnectingPoint num="2" id="6908" />
+<TGConnectingPoint num="3" id="6909" />
+<TGConnectingPoint num="4" id="6910" />
+<TGConnectingPoint num="5" id="6911" />
+<TGConnectingPoint num="6" id="6912" />
+<TGConnectingPoint num="7" id="6913" />
+<TGConnectingPoint num="8" id="6914" />
+<TGConnectingPoint num="9" id="6915" />
+<TGConnectingPoint num="10" id="6916" />
+<TGConnectingPoint num="11" id="6917" />
+<TGConnectingPoint num="12" id="6918" />
+<TGConnectingPoint num="13" id="6919" />
+<TGConnectingPoint num="14" id="6920" />
+<TGConnectingPoint num="15" id="6921" />
+<extraparam>
+<Line value="Create and send m3, message containing the encrypted session key" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="6963" >
+<cdparam x="338" y="1019" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg2" />
-<TGConnectingPoint num="0" id="5127" />
-<TGConnectingPoint num="1" id="5128" />
-<TGConnectingPoint num="2" id="5129" />
-<TGConnectingPoint num="3" id="5130" />
-<TGConnectingPoint num="4" id="5131" />
-<TGConnectingPoint num="5" id="5132" />
-<TGConnectingPoint num="6" id="5133" />
-<TGConnectingPoint num="7" id="5134" />
-<TGConnectingPoint num="8" id="5135" />
-<TGConnectingPoint num="9" id="5136" />
-<TGConnectingPoint num="10" id="5137" />
-<TGConnectingPoint num="11" id="5138" />
-<TGConnectingPoint num="12" id="5139" />
-<TGConnectingPoint num="13" id="5140" />
-<TGConnectingPoint num="14" id="5141" />
-<TGConnectingPoint num="15" id="5142" />
-<TGConnectingPoint num="16" id="5143" />
-<TGConnectingPoint num="17" id="5144" />
-<TGConnectingPoint num="18" id="5145" />
-<TGConnectingPoint num="19" id="5146" />
-<TGConnectingPoint num="20" id="5147" />
-<TGConnectingPoint num="21" id="5148" />
-<TGConnectingPoint num="22" id="5149" />
-<TGConnectingPoint num="23" id="5150" />
-<TGConnectingPoint num="24" id="5151" />
-<TGConnectingPoint num="25" id="5152" />
-<TGConnectingPoint num="26" id="5153" />
-<TGConnectingPoint num="27" id="5154" />
-<TGConnectingPoint num="28" id="5155" />
-<TGConnectingPoint num="29" id="5156" />
-<TGConnectingPoint num="30" id="5157" />
-<TGConnectingPoint num="31" id="5158" />
-<TGConnectingPoint num="32" id="5159" />
-<TGConnectingPoint num="33" id="5160" />
-<TGConnectingPoint num="34" id="5161" />
-<TGConnectingPoint num="35" id="5162" />
-<TGConnectingPoint num="36" id="5163" />
-<TGConnectingPoint num="37" id="5164" />
-<TGConnectingPoint num="38" id="5165" />
-<TGConnectingPoint num="39" id="5166" />
+<infoparam name="state0" value="ForgeMsg3" />
+<TGConnectingPoint num="0" id="6923" />
+<TGConnectingPoint num="1" id="6924" />
+<TGConnectingPoint num="2" id="6925" />
+<TGConnectingPoint num="3" id="6926" />
+<TGConnectingPoint num="4" id="6927" />
+<TGConnectingPoint num="5" id="6928" />
+<TGConnectingPoint num="6" id="6929" />
+<TGConnectingPoint num="7" id="6930" />
+<TGConnectingPoint num="8" id="6931" />
+<TGConnectingPoint num="9" id="6932" />
+<TGConnectingPoint num="10" id="6933" />
+<TGConnectingPoint num="11" id="6934" />
+<TGConnectingPoint num="12" id="6935" />
+<TGConnectingPoint num="13" id="6936" />
+<TGConnectingPoint num="14" id="6937" />
+<TGConnectingPoint num="15" id="6938" />
+<TGConnectingPoint num="16" id="6939" />
+<TGConnectingPoint num="17" id="6940" />
+<TGConnectingPoint num="18" id="6941" />
+<TGConnectingPoint num="19" id="6942" />
+<TGConnectingPoint num="20" id="6943" />
+<TGConnectingPoint num="21" id="6944" />
+<TGConnectingPoint num="22" id="6945" />
+<TGConnectingPoint num="23" id="6946" />
+<TGConnectingPoint num="24" id="6947" />
+<TGConnectingPoint num="25" id="6948" />
+<TGConnectingPoint num="26" id="6949" />
+<TGConnectingPoint num="27" id="6950" />
+<TGConnectingPoint num="28" id="6951" />
+<TGConnectingPoint num="29" id="6952" />
+<TGConnectingPoint num="30" id="6953" />
+<TGConnectingPoint num="31" id="6954" />
+<TGConnectingPoint num="32" id="6955" />
+<TGConnectingPoint num="33" id="6956" />
+<TGConnectingPoint num="34" id="6957" />
+<TGConnectingPoint num="35" id="6958" />
+<TGConnectingPoint num="36" id="6959" />
+<TGConnectingPoint num="37" id="6960" />
+<TGConnectingPoint num="38" id="6961" />
+<TGConnectingPoint num="39" id="6962" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5208" >
-<cdparam x="197" y="980" />
-<sizeparam width="107" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="7004" >
+<cdparam x="160" y="1019" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="UnexpectedMsg" />
-<TGConnectingPoint num="0" id="5168" />
-<TGConnectingPoint num="1" id="5169" />
-<TGConnectingPoint num="2" id="5170" />
-<TGConnectingPoint num="3" id="5171" />
-<TGConnectingPoint num="4" id="5172" />
-<TGConnectingPoint num="5" id="5173" />
-<TGConnectingPoint num="6" id="5174" />
-<TGConnectingPoint num="7" id="5175" />
-<TGConnectingPoint num="8" id="5176" />
-<TGConnectingPoint num="9" id="5177" />
-<TGConnectingPoint num="10" id="5178" />
-<TGConnectingPoint num="11" id="5179" />
-<TGConnectingPoint num="12" id="5180" />
-<TGConnectingPoint num="13" id="5181" />
-<TGConnectingPoint num="14" id="5182" />
-<TGConnectingPoint num="15" id="5183" />
-<TGConnectingPoint num="16" id="5184" />
-<TGConnectingPoint num="17" id="5185" />
-<TGConnectingPoint num="18" id="5186" />
-<TGConnectingPoint num="19" id="5187" />
-<TGConnectingPoint num="20" id="5188" />
-<TGConnectingPoint num="21" id="5189" />
-<TGConnectingPoint num="22" id="5190" />
-<TGConnectingPoint num="23" id="5191" />
-<TGConnectingPoint num="24" id="5192" />
-<TGConnectingPoint num="25" id="5193" />
-<TGConnectingPoint num="26" id="5194" />
-<TGConnectingPoint num="27" id="5195" />
-<TGConnectingPoint num="28" id="5196" />
-<TGConnectingPoint num="29" id="5197" />
-<TGConnectingPoint num="30" id="5198" />
-<TGConnectingPoint num="31" id="5199" />
-<TGConnectingPoint num="32" id="5200" />
-<TGConnectingPoint num="33" id="5201" />
-<TGConnectingPoint num="34" id="5202" />
-<TGConnectingPoint num="35" id="5203" />
-<TGConnectingPoint num="36" id="5204" />
-<TGConnectingPoint num="37" id="5205" />
-<TGConnectingPoint num="38" id="5206" />
-<TGConnectingPoint num="39" id="5207" />
+<infoparam name="state0" value="InvalidSig2" />
+<TGConnectingPoint num="0" id="6964" />
+<TGConnectingPoint num="1" id="6965" />
+<TGConnectingPoint num="2" id="6966" />
+<TGConnectingPoint num="3" id="6967" />
+<TGConnectingPoint num="4" id="6968" />
+<TGConnectingPoint num="5" id="6969" />
+<TGConnectingPoint num="6" id="6970" />
+<TGConnectingPoint num="7" id="6971" />
+<TGConnectingPoint num="8" id="6972" />
+<TGConnectingPoint num="9" id="6973" />
+<TGConnectingPoint num="10" id="6974" />
+<TGConnectingPoint num="11" id="6975" />
+<TGConnectingPoint num="12" id="6976" />
+<TGConnectingPoint num="13" id="6977" />
+<TGConnectingPoint num="14" id="6978" />
+<TGConnectingPoint num="15" id="6979" />
+<TGConnectingPoint num="16" id="6980" />
+<TGConnectingPoint num="17" id="6981" />
+<TGConnectingPoint num="18" id="6982" />
+<TGConnectingPoint num="19" id="6983" />
+<TGConnectingPoint num="20" id="6984" />
+<TGConnectingPoint num="21" id="6985" />
+<TGConnectingPoint num="22" id="6986" />
+<TGConnectingPoint num="23" id="6987" />
+<TGConnectingPoint num="24" id="6988" />
+<TGConnectingPoint num="25" id="6989" />
+<TGConnectingPoint num="26" id="6990" />
+<TGConnectingPoint num="27" id="6991" />
+<TGConnectingPoint num="28" id="6992" />
+<TGConnectingPoint num="29" id="6993" />
+<TGConnectingPoint num="30" id="6994" />
+<TGConnectingPoint num="31" id="6995" />
+<TGConnectingPoint num="32" id="6996" />
+<TGConnectingPoint num="33" id="6997" />
+<TGConnectingPoint num="34" id="6998" />
+<TGConnectingPoint num="35" id="6999" />
+<TGConnectingPoint num="36" id="7000" />
+<TGConnectingPoint num="37" id="7001" />
+<TGConnectingPoint num="38" id="7002" />
+<TGConnectingPoint num="39" id="7003" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5249" >
-<cdparam x="329" y="880" />
+<COMPONENT type="5106" id="7045" >
+<cdparam x="278" y="914" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyrpk" />
-<TGConnectingPoint num="0" id="5209" />
-<TGConnectingPoint num="1" id="5210" />
-<TGConnectingPoint num="2" id="5211" />
-<TGConnectingPoint num="3" id="5212" />
-<TGConnectingPoint num="4" id="5213" />
-<TGConnectingPoint num="5" id="5214" />
-<TGConnectingPoint num="6" id="5215" />
-<TGConnectingPoint num="7" id="5216" />
-<TGConnectingPoint num="8" id="5217" />
-<TGConnectingPoint num="9" id="5218" />
-<TGConnectingPoint num="10" id="5219" />
-<TGConnectingPoint num="11" id="5220" />
-<TGConnectingPoint num="12" id="5221" />
-<TGConnectingPoint num="13" id="5222" />
-<TGConnectingPoint num="14" id="5223" />
-<TGConnectingPoint num="15" id="5224" />
-<TGConnectingPoint num="16" id="5225" />
-<TGConnectingPoint num="17" id="5226" />
-<TGConnectingPoint num="18" id="5227" />
-<TGConnectingPoint num="19" id="5228" />
-<TGConnectingPoint num="20" id="5229" />
-<TGConnectingPoint num="21" id="5230" />
-<TGConnectingPoint num="22" id="5231" />
-<TGConnectingPoint num="23" id="5232" />
-<TGConnectingPoint num="24" id="5233" />
-<TGConnectingPoint num="25" id="5234" />
-<TGConnectingPoint num="26" id="5235" />
-<TGConnectingPoint num="27" id="5236" />
-<TGConnectingPoint num="28" id="5237" />
-<TGConnectingPoint num="29" id="5238" />
-<TGConnectingPoint num="30" id="5239" />
-<TGConnectingPoint num="31" id="5240" />
-<TGConnectingPoint num="32" id="5241" />
-<TGConnectingPoint num="33" id="5242" />
-<TGConnectingPoint num="34" id="5243" />
-<TGConnectingPoint num="35" id="5244" />
-<TGConnectingPoint num="36" id="5245" />
-<TGConnectingPoint num="37" id="5246" />
-<TGConnectingPoint num="38" id="5247" />
-<TGConnectingPoint num="39" id="5248" />
+<infoparam name="state0" value="VerifySig2" />
+<TGConnectingPoint num="0" id="7005" />
+<TGConnectingPoint num="1" id="7006" />
+<TGConnectingPoint num="2" id="7007" />
+<TGConnectingPoint num="3" id="7008" />
+<TGConnectingPoint num="4" id="7009" />
+<TGConnectingPoint num="5" id="7010" />
+<TGConnectingPoint num="6" id="7011" />
+<TGConnectingPoint num="7" id="7012" />
+<TGConnectingPoint num="8" id="7013" />
+<TGConnectingPoint num="9" id="7014" />
+<TGConnectingPoint num="10" id="7015" />
+<TGConnectingPoint num="11" id="7016" />
+<TGConnectingPoint num="12" id="7017" />
+<TGConnectingPoint num="13" id="7018" />
+<TGConnectingPoint num="14" id="7019" />
+<TGConnectingPoint num="15" id="7020" />
+<TGConnectingPoint num="16" id="7021" />
+<TGConnectingPoint num="17" id="7022" />
+<TGConnectingPoint num="18" id="7023" />
+<TGConnectingPoint num="19" id="7024" />
+<TGConnectingPoint num="20" id="7025" />
+<TGConnectingPoint num="21" id="7026" />
+<TGConnectingPoint num="22" id="7027" />
+<TGConnectingPoint num="23" id="7028" />
+<TGConnectingPoint num="24" id="7029" />
+<TGConnectingPoint num="25" id="7030" />
+<TGConnectingPoint num="26" id="7031" />
+<TGConnectingPoint num="27" id="7032" />
+<TGConnectingPoint num="28" id="7033" />
+<TGConnectingPoint num="29" id="7034" />
+<TGConnectingPoint num="30" id="7035" />
+<TGConnectingPoint num="31" id="7036" />
+<TGConnectingPoint num="32" id="7037" />
+<TGConnectingPoint num="33" id="7038" />
+<TGConnectingPoint num="34" id="7039" />
+<TGConnectingPoint num="35" id="7040" />
+<TGConnectingPoint num="36" id="7041" />
+<TGConnectingPoint num="37" id="7042" />
+<TGConnectingPoint num="38" id="7043" />
+<TGConnectingPoint num="39" id="7044" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5290" >
-<cdparam x="149" y="877" />
+<COMPONENT type="5106" id="7086" >
+<cdparam x="99" y="914" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig1" />
-<TGConnectingPoint num="0" id="5250" />
-<TGConnectingPoint num="1" id="5251" />
-<TGConnectingPoint num="2" id="5252" />
-<TGConnectingPoint num="3" id="5253" />
-<TGConnectingPoint num="4" id="5254" />
-<TGConnectingPoint num="5" id="5255" />
-<TGConnectingPoint num="6" id="5256" />
-<TGConnectingPoint num="7" id="5257" />
-<TGConnectingPoint num="8" id="5258" />
-<TGConnectingPoint num="9" id="5259" />
-<TGConnectingPoint num="10" id="5260" />
-<TGConnectingPoint num="11" id="5261" />
-<TGConnectingPoint num="12" id="5262" />
-<TGConnectingPoint num="13" id="5263" />
-<TGConnectingPoint num="14" id="5264" />
-<TGConnectingPoint num="15" id="5265" />
-<TGConnectingPoint num="16" id="5266" />
-<TGConnectingPoint num="17" id="5267" />
-<TGConnectingPoint num="18" id="5268" />
-<TGConnectingPoint num="19" id="5269" />
-<TGConnectingPoint num="20" id="5270" />
-<TGConnectingPoint num="21" id="5271" />
-<TGConnectingPoint num="22" id="5272" />
-<TGConnectingPoint num="23" id="5273" />
-<TGConnectingPoint num="24" id="5274" />
-<TGConnectingPoint num="25" id="5275" />
-<TGConnectingPoint num="26" id="5276" />
-<TGConnectingPoint num="27" id="5277" />
-<TGConnectingPoint num="28" id="5278" />
-<TGConnectingPoint num="29" id="5279" />
-<TGConnectingPoint num="30" id="5280" />
-<TGConnectingPoint num="31" id="5281" />
-<TGConnectingPoint num="32" id="5282" />
-<TGConnectingPoint num="33" id="5283" />
-<TGConnectingPoint num="34" id="5284" />
-<TGConnectingPoint num="35" id="5285" />
-<TGConnectingPoint num="36" id="5286" />
-<TGConnectingPoint num="37" id="5287" />
-<TGConnectingPoint num="38" id="5288" />
-<TGConnectingPoint num="39" id="5289" />
+<infoparam name="state0" value="InvalidCert2" />
+<TGConnectingPoint num="0" id="7046" />
+<TGConnectingPoint num="1" id="7047" />
+<TGConnectingPoint num="2" id="7048" />
+<TGConnectingPoint num="3" id="7049" />
+<TGConnectingPoint num="4" id="7050" />
+<TGConnectingPoint num="5" id="7051" />
+<TGConnectingPoint num="6" id="7052" />
+<TGConnectingPoint num="7" id="7053" />
+<TGConnectingPoint num="8" id="7054" />
+<TGConnectingPoint num="9" id="7055" />
+<TGConnectingPoint num="10" id="7056" />
+<TGConnectingPoint num="11" id="7057" />
+<TGConnectingPoint num="12" id="7058" />
+<TGConnectingPoint num="13" id="7059" />
+<TGConnectingPoint num="14" id="7060" />
+<TGConnectingPoint num="15" id="7061" />
+<TGConnectingPoint num="16" id="7062" />
+<TGConnectingPoint num="17" id="7063" />
+<TGConnectingPoint num="18" id="7064" />
+<TGConnectingPoint num="19" id="7065" />
+<TGConnectingPoint num="20" id="7066" />
+<TGConnectingPoint num="21" id="7067" />
+<TGConnectingPoint num="22" id="7068" />
+<TGConnectingPoint num="23" id="7069" />
+<TGConnectingPoint num="24" id="7070" />
+<TGConnectingPoint num="25" id="7071" />
+<TGConnectingPoint num="26" id="7072" />
+<TGConnectingPoint num="27" id="7073" />
+<TGConnectingPoint num="28" id="7074" />
+<TGConnectingPoint num="29" id="7075" />
+<TGConnectingPoint num="30" id="7076" />
+<TGConnectingPoint num="31" id="7077" />
+<TGConnectingPoint num="32" id="7078" />
+<TGConnectingPoint num="33" id="7079" />
+<TGConnectingPoint num="34" id="7080" />
+<TGConnectingPoint num="35" id="7081" />
+<TGConnectingPoint num="36" id="7082" />
+<TGConnectingPoint num="37" id="7083" />
+<TGConnectingPoint num="38" id="7084" />
+<TGConnectingPoint num="39" id="7085" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5331" >
-<cdparam x="267" y="778" />
+<COMPONENT type="5106" id="7127" >
+<cdparam x="198" y="809" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig1" />
-<TGConnectingPoint num="0" id="5291" />
-<TGConnectingPoint num="1" id="5292" />
-<TGConnectingPoint num="2" id="5293" />
-<TGConnectingPoint num="3" id="5294" />
-<TGConnectingPoint num="4" id="5295" />
-<TGConnectingPoint num="5" id="5296" />
-<TGConnectingPoint num="6" id="5297" />
-<TGConnectingPoint num="7" id="5298" />
-<TGConnectingPoint num="8" id="5299" />
-<TGConnectingPoint num="9" id="5300" />
-<TGConnectingPoint num="10" id="5301" />
-<TGConnectingPoint num="11" id="5302" />
-<TGConnectingPoint num="12" id="5303" />
-<TGConnectingPoint num="13" id="5304" />
-<TGConnectingPoint num="14" id="5305" />
-<TGConnectingPoint num="15" id="5306" />
-<TGConnectingPoint num="16" id="5307" />
-<TGConnectingPoint num="17" id="5308" />
-<TGConnectingPoint num="18" id="5309" />
-<TGConnectingPoint num="19" id="5310" />
-<TGConnectingPoint num="20" id="5311" />
-<TGConnectingPoint num="21" id="5312" />
-<TGConnectingPoint num="22" id="5313" />
-<TGConnectingPoint num="23" id="5314" />
-<TGConnectingPoint num="24" id="5315" />
-<TGConnectingPoint num="25" id="5316" />
-<TGConnectingPoint num="26" id="5317" />
-<TGConnectingPoint num="27" id="5318" />
-<TGConnectingPoint num="28" id="5319" />
-<TGConnectingPoint num="29" id="5320" />
-<TGConnectingPoint num="30" id="5321" />
-<TGConnectingPoint num="31" id="5322" />
-<TGConnectingPoint num="32" id="5323" />
-<TGConnectingPoint num="33" id="5324" />
-<TGConnectingPoint num="34" id="5325" />
-<TGConnectingPoint num="35" id="5326" />
-<TGConnectingPoint num="36" id="5327" />
-<TGConnectingPoint num="37" id="5328" />
-<TGConnectingPoint num="38" id="5329" />
-<TGConnectingPoint num="39" id="5330" />
+<infoparam name="state0" value="VerifyCert2" />
+<TGConnectingPoint num="0" id="7087" />
+<TGConnectingPoint num="1" id="7088" />
+<TGConnectingPoint num="2" id="7089" />
+<TGConnectingPoint num="3" id="7090" />
+<TGConnectingPoint num="4" id="7091" />
+<TGConnectingPoint num="5" id="7092" />
+<TGConnectingPoint num="6" id="7093" />
+<TGConnectingPoint num="7" id="7094" />
+<TGConnectingPoint num="8" id="7095" />
+<TGConnectingPoint num="9" id="7096" />
+<TGConnectingPoint num="10" id="7097" />
+<TGConnectingPoint num="11" id="7098" />
+<TGConnectingPoint num="12" id="7099" />
+<TGConnectingPoint num="13" id="7100" />
+<TGConnectingPoint num="14" id="7101" />
+<TGConnectingPoint num="15" id="7102" />
+<TGConnectingPoint num="16" id="7103" />
+<TGConnectingPoint num="17" id="7104" />
+<TGConnectingPoint num="18" id="7105" />
+<TGConnectingPoint num="19" id="7106" />
+<TGConnectingPoint num="20" id="7107" />
+<TGConnectingPoint num="21" id="7108" />
+<TGConnectingPoint num="22" id="7109" />
+<TGConnectingPoint num="23" id="7110" />
+<TGConnectingPoint num="24" id="7111" />
+<TGConnectingPoint num="25" id="7112" />
+<TGConnectingPoint num="26" id="7113" />
+<TGConnectingPoint num="27" id="7114" />
+<TGConnectingPoint num="28" id="7115" />
+<TGConnectingPoint num="29" id="7116" />
+<TGConnectingPoint num="30" id="7117" />
+<TGConnectingPoint num="31" id="7118" />
+<TGConnectingPoint num="32" id="7119" />
+<TGConnectingPoint num="33" id="7120" />
+<TGConnectingPoint num="34" id="7121" />
+<TGConnectingPoint num="35" id="7122" />
+<TGConnectingPoint num="36" id="7123" />
+<TGConnectingPoint num="37" id="7124" />
+<TGConnectingPoint num="38" id="7125" />
+<TGConnectingPoint num="39" id="7126" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5372" >
-<cdparam x="63" y="778" />
+<COMPONENT type="5106" id="7168" >
+<cdparam x="27" y="809" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts1" />
-<TGConnectingPoint num="0" id="5332" />
-<TGConnectingPoint num="1" id="5333" />
-<TGConnectingPoint num="2" id="5334" />
-<TGConnectingPoint num="3" id="5335" />
-<TGConnectingPoint num="4" id="5336" />
-<TGConnectingPoint num="5" id="5337" />
-<TGConnectingPoint num="6" id="5338" />
-<TGConnectingPoint num="7" id="5339" />
-<TGConnectingPoint num="8" id="5340" />
-<TGConnectingPoint num="9" id="5341" />
-<TGConnectingPoint num="10" id="5342" />
-<TGConnectingPoint num="11" id="5343" />
-<TGConnectingPoint num="12" id="5344" />
-<TGConnectingPoint num="13" id="5345" />
-<TGConnectingPoint num="14" id="5346" />
-<TGConnectingPoint num="15" id="5347" />
-<TGConnectingPoint num="16" id="5348" />
-<TGConnectingPoint num="17" id="5349" />
-<TGConnectingPoint num="18" id="5350" />
-<TGConnectingPoint num="19" id="5351" />
-<TGConnectingPoint num="20" id="5352" />
-<TGConnectingPoint num="21" id="5353" />
-<TGConnectingPoint num="22" id="5354" />
-<TGConnectingPoint num="23" id="5355" />
-<TGConnectingPoint num="24" id="5356" />
-<TGConnectingPoint num="25" id="5357" />
-<TGConnectingPoint num="26" id="5358" />
-<TGConnectingPoint num="27" id="5359" />
-<TGConnectingPoint num="28" id="5360" />
-<TGConnectingPoint num="29" id="5361" />
-<TGConnectingPoint num="30" id="5362" />
-<TGConnectingPoint num="31" id="5363" />
-<TGConnectingPoint num="32" id="5364" />
-<TGConnectingPoint num="33" id="5365" />
-<TGConnectingPoint num="34" id="5366" />
-<TGConnectingPoint num="35" id="5367" />
-<TGConnectingPoint num="36" id="5368" />
-<TGConnectingPoint num="37" id="5369" />
-<TGConnectingPoint num="38" id="5370" />
-<TGConnectingPoint num="39" id="5371" />
+<infoparam name="state0" value="Invalidts2" />
+<TGConnectingPoint num="0" id="7128" />
+<TGConnectingPoint num="1" id="7129" />
+<TGConnectingPoint num="2" id="7130" />
+<TGConnectingPoint num="3" id="7131" />
+<TGConnectingPoint num="4" id="7132" />
+<TGConnectingPoint num="5" id="7133" />
+<TGConnectingPoint num="6" id="7134" />
+<TGConnectingPoint num="7" id="7135" />
+<TGConnectingPoint num="8" id="7136" />
+<TGConnectingPoint num="9" id="7137" />
+<TGConnectingPoint num="10" id="7138" />
+<TGConnectingPoint num="11" id="7139" />
+<TGConnectingPoint num="12" id="7140" />
+<TGConnectingPoint num="13" id="7141" />
+<TGConnectingPoint num="14" id="7142" />
+<TGConnectingPoint num="15" id="7143" />
+<TGConnectingPoint num="16" id="7144" />
+<TGConnectingPoint num="17" id="7145" />
+<TGConnectingPoint num="18" id="7146" />
+<TGConnectingPoint num="19" id="7147" />
+<TGConnectingPoint num="20" id="7148" />
+<TGConnectingPoint num="21" id="7149" />
+<TGConnectingPoint num="22" id="7150" />
+<TGConnectingPoint num="23" id="7151" />
+<TGConnectingPoint num="24" id="7152" />
+<TGConnectingPoint num="25" id="7153" />
+<TGConnectingPoint num="26" id="7154" />
+<TGConnectingPoint num="27" id="7155" />
+<TGConnectingPoint num="28" id="7156" />
+<TGConnectingPoint num="29" id="7157" />
+<TGConnectingPoint num="30" id="7158" />
+<TGConnectingPoint num="31" id="7159" />
+<TGConnectingPoint num="32" id="7160" />
+<TGConnectingPoint num="33" id="7161" />
+<TGConnectingPoint num="34" id="7162" />
+<TGConnectingPoint num="35" id="7163" />
+<TGConnectingPoint num="36" id="7164" />
+<TGConnectingPoint num="37" id="7165" />
+<TGConnectingPoint num="38" id="7166" />
+<TGConnectingPoint num="39" id="7167" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5413" >
-<cdparam x="277" y="384" />
-<sizeparam width="102" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="7185" >
+<cdparam x="266" y="553" />
+<sizeparam width="288" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="ValidCert0" />
-<TGConnectingPoint num="0" id="5373" />
-<TGConnectingPoint num="1" id="5374" />
-<TGConnectingPoint num="2" id="5375" />
-<TGConnectingPoint num="3" id="5376" />
-<TGConnectingPoint num="4" id="5377" />
-<TGConnectingPoint num="5" id="5378" />
-<TGConnectingPoint num="6" id="5379" />
-<TGConnectingPoint num="7" id="5380" />
-<TGConnectingPoint num="8" id="5381" />
-<TGConnectingPoint num="9" id="5382" />
-<TGConnectingPoint num="10" id="5383" />
-<TGConnectingPoint num="11" id="5384" />
-<TGConnectingPoint num="12" id="5385" />
-<TGConnectingPoint num="13" id="5386" />
-<TGConnectingPoint num="14" id="5387" />
-<TGConnectingPoint num="15" id="5388" />
-<TGConnectingPoint num="16" id="5389" />
-<TGConnectingPoint num="17" id="5390" />
-<TGConnectingPoint num="18" id="5391" />
-<TGConnectingPoint num="19" id="5392" />
-<TGConnectingPoint num="20" id="5393" />
-<TGConnectingPoint num="21" id="5394" />
-<TGConnectingPoint num="22" id="5395" />
-<TGConnectingPoint num="23" id="5396" />
-<TGConnectingPoint num="24" id="5397" />
-<TGConnectingPoint num="25" id="5398" />
-<TGConnectingPoint num="26" id="5399" />
-<TGConnectingPoint num="27" id="5400" />
-<TGConnectingPoint num="28" id="5401" />
-<TGConnectingPoint num="29" id="5402" />
-<TGConnectingPoint num="30" id="5403" />
-<TGConnectingPoint num="31" id="5404" />
-<TGConnectingPoint num="32" id="5405" />
-<TGConnectingPoint num="33" id="5406" />
-<TGConnectingPoint num="34" id="5407" />
-<TGConnectingPoint num="35" id="5408" />
-<TGConnectingPoint num="36" id="5409" />
-<TGConnectingPoint num="37" id="5410" />
-<TGConnectingPoint num="38" id="5411" />
-<TGConnectingPoint num="39" id="5412" />
+<infoparam name="UML Note" value="Receive and verify m2: certified pk from ECU2
+" />
+<TGConnectingPoint num="0" id="7169" />
+<TGConnectingPoint num="1" id="7170" />
+<TGConnectingPoint num="2" id="7171" />
+<TGConnectingPoint num="3" id="7172" />
+<TGConnectingPoint num="4" id="7173" />
+<TGConnectingPoint num="5" id="7174" />
+<TGConnectingPoint num="6" id="7175" />
+<TGConnectingPoint num="7" id="7176" />
+<TGConnectingPoint num="8" id="7177" />
+<TGConnectingPoint num="9" id="7178" />
+<TGConnectingPoint num="10" id="7179" />
+<TGConnectingPoint num="11" id="7180" />
+<TGConnectingPoint num="12" id="7181" />
+<TGConnectingPoint num="13" id="7182" />
+<TGConnectingPoint num="14" id="7183" />
+<TGConnectingPoint num="15" id="7184" />
 <extraparam>
+<Line value="Receive and verify m2: certified pk from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5454" >
-<cdparam x="189" y="687" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="7202" >
+<cdparam x="277" y="318" />
+<sizeparam width="356" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="Testts1" />
-<TGConnectingPoint num="0" id="5414" />
-<TGConnectingPoint num="1" id="5415" />
-<TGConnectingPoint num="2" id="5416" />
-<TGConnectingPoint num="3" id="5417" />
-<TGConnectingPoint num="4" id="5418" />
-<TGConnectingPoint num="5" id="5419" />
-<TGConnectingPoint num="6" id="5420" />
-<TGConnectingPoint num="7" id="5421" />
-<TGConnectingPoint num="8" id="5422" />
-<TGConnectingPoint num="9" id="5423" />
-<TGConnectingPoint num="10" id="5424" />
-<TGConnectingPoint num="11" id="5425" />
-<TGConnectingPoint num="12" id="5426" />
-<TGConnectingPoint num="13" id="5427" />
-<TGConnectingPoint num="14" id="5428" />
-<TGConnectingPoint num="15" id="5429" />
-<TGConnectingPoint num="16" id="5430" />
-<TGConnectingPoint num="17" id="5431" />
-<TGConnectingPoint num="18" id="5432" />
-<TGConnectingPoint num="19" id="5433" />
-<TGConnectingPoint num="20" id="5434" />
-<TGConnectingPoint num="21" id="5435" />
-<TGConnectingPoint num="22" id="5436" />
-<TGConnectingPoint num="23" id="5437" />
-<TGConnectingPoint num="24" id="5438" />
-<TGConnectingPoint num="25" id="5439" />
-<TGConnectingPoint num="26" id="5440" />
-<TGConnectingPoint num="27" id="5441" />
-<TGConnectingPoint num="28" id="5442" />
-<TGConnectingPoint num="29" id="5443" />
-<TGConnectingPoint num="30" id="5444" />
-<TGConnectingPoint num="31" id="5445" />
-<TGConnectingPoint num="32" id="5446" />
-<TGConnectingPoint num="33" id="5447" />
-<TGConnectingPoint num="34" id="5448" />
-<TGConnectingPoint num="35" id="5449" />
-<TGConnectingPoint num="36" id="5450" />
-<TGConnectingPoint num="37" id="5451" />
-<TGConnectingPoint num="38" id="5452" />
-<TGConnectingPoint num="39" id="5453" />
+<infoparam name="UML Note" value="Create request message m1 to ask for public key of ECU2
+" />
+<TGConnectingPoint num="0" id="7186" />
+<TGConnectingPoint num="1" id="7187" />
+<TGConnectingPoint num="2" id="7188" />
+<TGConnectingPoint num="3" id="7189" />
+<TGConnectingPoint num="4" id="7190" />
+<TGConnectingPoint num="5" id="7191" />
+<TGConnectingPoint num="6" id="7192" />
+<TGConnectingPoint num="7" id="7193" />
+<TGConnectingPoint num="8" id="7194" />
+<TGConnectingPoint num="9" id="7195" />
+<TGConnectingPoint num="10" id="7196" />
+<TGConnectingPoint num="11" id="7197" />
+<TGConnectingPoint num="12" id="7198" />
+<TGConnectingPoint num="13" id="7199" />
+<TGConnectingPoint num="14" id="7200" />
+<TGConnectingPoint num="15" id="7201" />
 <extraparam>
+<Line value="Create request message m1 to ask for public key of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5465" >
-<cdparam x="216" y="629" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="7219" >
+<cdparam x="278" y="59" />
+<sizeparam width="308" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Receive signal" value="chin(m1)" />
-<TGConnectingPoint num="0" id="5455" />
-<TGConnectingPoint num="1" id="5456" />
-<TGConnectingPoint num="2" id="5457" />
-<TGConnectingPoint num="3" id="5458" />
-<TGConnectingPoint num="4" id="5459" />
-<TGConnectingPoint num="5" id="5460" />
-<TGConnectingPoint num="6" id="5461" />
-<TGConnectingPoint num="7" id="5462" />
-<TGConnectingPoint num="8" id="5463" />
-<TGConnectingPoint num="9" id="5464" />
+<infoparam name="UML Note" value="Create m0: Send own certified public key to ECU2
+" />
+<TGConnectingPoint num="0" id="7203" />
+<TGConnectingPoint num="1" id="7204" />
+<TGConnectingPoint num="2" id="7205" />
+<TGConnectingPoint num="3" id="7206" />
+<TGConnectingPoint num="4" id="7207" />
+<TGConnectingPoint num="5" id="7208" />
+<TGConnectingPoint num="6" id="7209" />
+<TGConnectingPoint num="7" id="7210" />
+<TGConnectingPoint num="8" id="7211" />
+<TGConnectingPoint num="9" id="7212" />
+<TGConnectingPoint num="10" id="7213" />
+<TGConnectingPoint num="11" id="7214" />
+<TGConnectingPoint num="12" id="7215" />
+<TGConnectingPoint num="13" id="7216" />
+<TGConnectingPoint num="14" id="7217" />
+<TGConnectingPoint num="15" id="7218" />
+<extraparam>
+<Line value="Create m0: Send own certified public key to ECU2" />
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5506" >
-<cdparam x="242" y="559" />
-<sizeparam width="118" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="7260" >
+<cdparam x="112" y="699" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="WaitForMsg1" />
-<TGConnectingPoint num="0" id="5466" />
-<TGConnectingPoint num="1" id="5467" />
-<TGConnectingPoint num="2" id="5468" />
-<TGConnectingPoint num="3" id="5469" />
-<TGConnectingPoint num="4" id="5470" />
-<TGConnectingPoint num="5" id="5471" />
-<TGConnectingPoint num="6" id="5472" />
-<TGConnectingPoint num="7" id="5473" />
-<TGConnectingPoint num="8" id="5474" />
-<TGConnectingPoint num="9" id="5475" />
-<TGConnectingPoint num="10" id="5476" />
-<TGConnectingPoint num="11" id="5477" />
-<TGConnectingPoint num="12" id="5478" />
-<TGConnectingPoint num="13" id="5479" />
-<TGConnectingPoint num="14" id="5480" />
-<TGConnectingPoint num="15" id="5481" />
-<TGConnectingPoint num="16" id="5482" />
-<TGConnectingPoint num="17" id="5483" />
-<TGConnectingPoint num="18" id="5484" />
-<TGConnectingPoint num="19" id="5485" />
-<TGConnectingPoint num="20" id="5486" />
-<TGConnectingPoint num="21" id="5487" />
-<TGConnectingPoint num="22" id="5488" />
-<TGConnectingPoint num="23" id="5489" />
-<TGConnectingPoint num="24" id="5490" />
-<TGConnectingPoint num="25" id="5491" />
-<TGConnectingPoint num="26" id="5492" />
-<TGConnectingPoint num="27" id="5493" />
-<TGConnectingPoint num="28" id="5494" />
-<TGConnectingPoint num="29" id="5495" />
-<TGConnectingPoint num="30" id="5496" />
-<TGConnectingPoint num="31" id="5497" />
-<TGConnectingPoint num="32" id="5498" />
-<TGConnectingPoint num="33" id="5499" />
-<TGConnectingPoint num="34" id="5500" />
-<TGConnectingPoint num="35" id="5501" />
-<TGConnectingPoint num="36" id="5502" />
-<TGConnectingPoint num="37" id="5503" />
-<TGConnectingPoint num="38" id="5504" />
-<TGConnectingPoint num="39" id="5505" />
+<infoparam name="state0" value="Testts2" />
+<TGConnectingPoint num="0" id="7220" />
+<TGConnectingPoint num="1" id="7221" />
+<TGConnectingPoint num="2" id="7222" />
+<TGConnectingPoint num="3" id="7223" />
+<TGConnectingPoint num="4" id="7224" />
+<TGConnectingPoint num="5" id="7225" />
+<TGConnectingPoint num="6" id="7226" />
+<TGConnectingPoint num="7" id="7227" />
+<TGConnectingPoint num="8" id="7228" />
+<TGConnectingPoint num="9" id="7229" />
+<TGConnectingPoint num="10" id="7230" />
+<TGConnectingPoint num="11" id="7231" />
+<TGConnectingPoint num="12" id="7232" />
+<TGConnectingPoint num="13" id="7233" />
+<TGConnectingPoint num="14" id="7234" />
+<TGConnectingPoint num="15" id="7235" />
+<TGConnectingPoint num="16" id="7236" />
+<TGConnectingPoint num="17" id="7237" />
+<TGConnectingPoint num="18" id="7238" />
+<TGConnectingPoint num="19" id="7239" />
+<TGConnectingPoint num="20" id="7240" />
+<TGConnectingPoint num="21" id="7241" />
+<TGConnectingPoint num="22" id="7242" />
+<TGConnectingPoint num="23" id="7243" />
+<TGConnectingPoint num="24" id="7244" />
+<TGConnectingPoint num="25" id="7245" />
+<TGConnectingPoint num="26" id="7246" />
+<TGConnectingPoint num="27" id="7247" />
+<TGConnectingPoint num="28" id="7248" />
+<TGConnectingPoint num="29" id="7249" />
+<TGConnectingPoint num="30" id="7250" />
+<TGConnectingPoint num="31" id="7251" />
+<TGConnectingPoint num="32" id="7252" />
+<TGConnectingPoint num="33" id="7253" />
+<TGConnectingPoint num="34" id="7254" />
+<TGConnectingPoint num="35" id="7255" />
+<TGConnectingPoint num="36" id="7256" />
+<TGConnectingPoint num="37" id="7257" />
+<TGConnectingPoint num="38" id="7258" />
+<TGConnectingPoint num="39" id="7259" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5547" >
-<cdparam x="18" y="560" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="7271" >
+<cdparam x="49" y="621" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state0" value="InvalidSig0" />
-<TGConnectingPoint num="0" id="5507" />
-<TGConnectingPoint num="1" id="5508" />
-<TGConnectingPoint num="2" id="5509" />
-<TGConnectingPoint num="3" id="5510" />
-<TGConnectingPoint num="4" id="5511" />
-<TGConnectingPoint num="5" id="5512" />
-<TGConnectingPoint num="6" id="5513" />
-<TGConnectingPoint num="7" id="5514" />
-<TGConnectingPoint num="8" id="5515" />
-<TGConnectingPoint num="9" id="5516" />
-<TGConnectingPoint num="10" id="5517" />
-<TGConnectingPoint num="11" id="5518" />
-<TGConnectingPoint num="12" id="5519" />
-<TGConnectingPoint num="13" id="5520" />
-<TGConnectingPoint num="14" id="5521" />
-<TGConnectingPoint num="15" id="5522" />
-<TGConnectingPoint num="16" id="5523" />
-<TGConnectingPoint num="17" id="5524" />
-<TGConnectingPoint num="18" id="5525" />
-<TGConnectingPoint num="19" id="5526" />
-<TGConnectingPoint num="20" id="5527" />
-<TGConnectingPoint num="21" id="5528" />
-<TGConnectingPoint num="22" id="5529" />
-<TGConnectingPoint num="23" id="5530" />
-<TGConnectingPoint num="24" id="5531" />
-<TGConnectingPoint num="25" id="5532" />
-<TGConnectingPoint num="26" id="5533" />
-<TGConnectingPoint num="27" id="5534" />
-<TGConnectingPoint num="28" id="5535" />
-<TGConnectingPoint num="29" id="5536" />
-<TGConnectingPoint num="30" id="5537" />
-<TGConnectingPoint num="31" id="5538" />
-<TGConnectingPoint num="32" id="5539" />
-<TGConnectingPoint num="33" id="5540" />
-<TGConnectingPoint num="34" id="5541" />
-<TGConnectingPoint num="35" id="5542" />
-<TGConnectingPoint num="36" id="5543" />
-<TGConnectingPoint num="37" id="5544" />
-<TGConnectingPoint num="38" id="5545" />
-<TGConnectingPoint num="39" id="5546" />
-<extraparam>
-</extraparam>
+<infoparam name="Receive signal" value="chin(m2)" />
+<TGConnectingPoint num="0" id="7261" />
+<TGConnectingPoint num="1" id="7262" />
+<TGConnectingPoint num="2" id="7263" />
+<TGConnectingPoint num="3" id="7264" />
+<TGConnectingPoint num="4" id="7265" />
+<TGConnectingPoint num="5" id="7266" />
+<TGConnectingPoint num="6" id="7267" />
+<TGConnectingPoint num="7" id="7268" />
+<TGConnectingPoint num="8" id="7269" />
+<TGConnectingPoint num="9" id="7270" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="5588" >
-<cdparam x="240" y="479" />
+<COMPONENT type="5106" id="7312" >
+<cdparam x="27" y="550" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state1" value="VerifySig0" />
-<TGConnectingPoint num="0" id="5548" />
-<TGConnectingPoint num="1" id="5549" />
-<TGConnectingPoint num="2" id="5550" />
-<TGConnectingPoint num="3" id="5551" />
-<TGConnectingPoint num="4" id="5552" />
-<TGConnectingPoint num="5" id="5553" />
-<TGConnectingPoint num="6" id="5554" />
-<TGConnectingPoint num="7" id="5555" />
-<TGConnectingPoint num="8" id="5556" />
-<TGConnectingPoint num="9" id="5557" />
-<TGConnectingPoint num="10" id="5558" />
-<TGConnectingPoint num="11" id="5559" />
-<TGConnectingPoint num="12" id="5560" />
-<TGConnectingPoint num="13" id="5561" />
-<TGConnectingPoint num="14" id="5562" />
-<TGConnectingPoint num="15" id="5563" />
-<TGConnectingPoint num="16" id="5564" />
-<TGConnectingPoint num="17" id="5565" />
-<TGConnectingPoint num="18" id="5566" />
-<TGConnectingPoint num="19" id="5567" />
-<TGConnectingPoint num="20" id="5568" />
-<TGConnectingPoint num="21" id="5569" />
-<TGConnectingPoint num="22" id="5570" />
-<TGConnectingPoint num="23" id="5571" />
-<TGConnectingPoint num="24" id="5572" />
-<TGConnectingPoint num="25" id="5573" />
-<TGConnectingPoint num="26" id="5574" />
-<TGConnectingPoint num="27" id="5575" />
-<TGConnectingPoint num="28" id="5576" />
-<TGConnectingPoint num="29" id="5577" />
-<TGConnectingPoint num="30" id="5578" />
-<TGConnectingPoint num="31" id="5579" />
-<TGConnectingPoint num="32" id="5580" />
-<TGConnectingPoint num="33" id="5581" />
-<TGConnectingPoint num="34" id="5582" />
-<TGConnectingPoint num="35" id="5583" />
-<TGConnectingPoint num="36" id="5584" />
-<TGConnectingPoint num="37" id="5585" />
-<TGConnectingPoint num="38" id="5586" />
-<TGConnectingPoint num="39" id="5587" />
+<infoparam name="state0" value="WaitForMsg2" />
+<TGConnectingPoint num="0" id="7272" />
+<TGConnectingPoint num="1" id="7273" />
+<TGConnectingPoint num="2" id="7274" />
+<TGConnectingPoint num="3" id="7275" />
+<TGConnectingPoint num="4" id="7276" />
+<TGConnectingPoint num="5" id="7277" />
+<TGConnectingPoint num="6" id="7278" />
+<TGConnectingPoint num="7" id="7279" />
+<TGConnectingPoint num="8" id="7280" />
+<TGConnectingPoint num="9" id="7281" />
+<TGConnectingPoint num="10" id="7282" />
+<TGConnectingPoint num="11" id="7283" />
+<TGConnectingPoint num="12" id="7284" />
+<TGConnectingPoint num="13" id="7285" />
+<TGConnectingPoint num="14" id="7286" />
+<TGConnectingPoint num="15" id="7287" />
+<TGConnectingPoint num="16" id="7288" />
+<TGConnectingPoint num="17" id="7289" />
+<TGConnectingPoint num="18" id="7290" />
+<TGConnectingPoint num="19" id="7291" />
+<TGConnectingPoint num="20" id="7292" />
+<TGConnectingPoint num="21" id="7293" />
+<TGConnectingPoint num="22" id="7294" />
+<TGConnectingPoint num="23" id="7295" />
+<TGConnectingPoint num="24" id="7296" />
+<TGConnectingPoint num="25" id="7297" />
+<TGConnectingPoint num="26" id="7298" />
+<TGConnectingPoint num="27" id="7299" />
+<TGConnectingPoint num="28" id="7300" />
+<TGConnectingPoint num="29" id="7301" />
+<TGConnectingPoint num="30" id="7302" />
+<TGConnectingPoint num="31" id="7303" />
+<TGConnectingPoint num="32" id="7304" />
+<TGConnectingPoint num="33" id="7305" />
+<TGConnectingPoint num="34" id="7306" />
+<TGConnectingPoint num="35" id="7307" />
+<TGConnectingPoint num="36" id="7308" />
+<TGConnectingPoint num="37" id="7309" />
+<TGConnectingPoint num="38" id="7310" />
+<TGConnectingPoint num="39" id="7311" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5629" >
-<cdparam x="122" y="395" />
+<COMPONENT type="5103" id="7323" >
+<cdparam x="57" y="508" />
+<sizeparam width="68" 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="2900" />
+<infoparam name="Send signal" value="chout(m1)" />
+<TGConnectingPoint num="0" id="7313" />
+<TGConnectingPoint num="1" id="7314" />
+<TGConnectingPoint num="2" id="7315" />
+<TGConnectingPoint num="3" id="7316" />
+<TGConnectingPoint num="4" id="7317" />
+<TGConnectingPoint num="5" id="7318" />
+<TGConnectingPoint num="6" id="7319" />
+<TGConnectingPoint num="7" id="7320" />
+<TGConnectingPoint num="8" id="7321" />
+<TGConnectingPoint num="9" id="7322" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="7364" >
+<cdparam x="35" y="436" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidCert0" />
-<TGConnectingPoint num="0" id="5589" />
-<TGConnectingPoint num="1" id="5590" />
-<TGConnectingPoint num="2" id="5591" />
-<TGConnectingPoint num="3" id="5592" />
-<TGConnectingPoint num="4" id="5593" />
-<TGConnectingPoint num="5" id="5594" />
-<TGConnectingPoint num="6" id="5595" />
-<TGConnectingPoint num="7" id="5596" />
-<TGConnectingPoint num="8" id="5597" />
-<TGConnectingPoint num="9" id="5598" />
-<TGConnectingPoint num="10" id="5599" />
-<TGConnectingPoint num="11" id="5600" />
-<TGConnectingPoint num="12" id="5601" />
-<TGConnectingPoint num="13" id="5602" />
-<TGConnectingPoint num="14" id="5603" />
-<TGConnectingPoint num="15" id="5604" />
-<TGConnectingPoint num="16" id="5605" />
-<TGConnectingPoint num="17" id="5606" />
-<TGConnectingPoint num="18" id="5607" />
-<TGConnectingPoint num="19" id="5608" />
-<TGConnectingPoint num="20" id="5609" />
-<TGConnectingPoint num="21" id="5610" />
-<TGConnectingPoint num="22" id="5611" />
-<TGConnectingPoint num="23" id="5612" />
-<TGConnectingPoint num="24" id="5613" />
-<TGConnectingPoint num="25" id="5614" />
-<TGConnectingPoint num="26" id="5615" />
-<TGConnectingPoint num="27" id="5616" />
-<TGConnectingPoint num="28" id="5617" />
-<TGConnectingPoint num="29" id="5618" />
-<TGConnectingPoint num="30" id="5619" />
-<TGConnectingPoint num="31" id="5620" />
-<TGConnectingPoint num="32" id="5621" />
-<TGConnectingPoint num="33" id="5622" />
-<TGConnectingPoint num="34" id="5623" />
-<TGConnectingPoint num="35" id="5624" />
-<TGConnectingPoint num="36" id="5625" />
-<TGConnectingPoint num="37" id="5626" />
-<TGConnectingPoint num="38" id="5627" />
-<TGConnectingPoint num="39" id="5628" />
+<infoparam name="state0" value="SendMsg1" />
+<TGConnectingPoint num="0" id="7324" />
+<TGConnectingPoint num="1" id="7325" />
+<TGConnectingPoint num="2" id="7326" />
+<TGConnectingPoint num="3" id="7327" />
+<TGConnectingPoint num="4" id="7328" />
+<TGConnectingPoint num="5" id="7329" />
+<TGConnectingPoint num="6" id="7330" />
+<TGConnectingPoint num="7" id="7331" />
+<TGConnectingPoint num="8" id="7332" />
+<TGConnectingPoint num="9" id="7333" />
+<TGConnectingPoint num="10" id="7334" />
+<TGConnectingPoint num="11" id="7335" />
+<TGConnectingPoint num="12" id="7336" />
+<TGConnectingPoint num="13" id="7337" />
+<TGConnectingPoint num="14" id="7338" />
+<TGConnectingPoint num="15" id="7339" />
+<TGConnectingPoint num="16" id="7340" />
+<TGConnectingPoint num="17" id="7341" />
+<TGConnectingPoint num="18" id="7342" />
+<TGConnectingPoint num="19" id="7343" />
+<TGConnectingPoint num="20" id="7344" />
+<TGConnectingPoint num="21" id="7345" />
+<TGConnectingPoint num="22" id="7346" />
+<TGConnectingPoint num="23" id="7347" />
+<TGConnectingPoint num="24" id="7348" />
+<TGConnectingPoint num="25" id="7349" />
+<TGConnectingPoint num="26" id="7350" />
+<TGConnectingPoint num="27" id="7351" />
+<TGConnectingPoint num="28" id="7352" />
+<TGConnectingPoint num="29" id="7353" />
+<TGConnectingPoint num="30" id="7354" />
+<TGConnectingPoint num="31" id="7355" />
+<TGConnectingPoint num="32" id="7356" />
+<TGConnectingPoint num="33" id="7357" />
+<TGConnectingPoint num="34" id="7358" />
+<TGConnectingPoint num="35" id="7359" />
+<TGConnectingPoint num="36" id="7360" />
+<TGConnectingPoint num="37" id="7361" />
+<TGConnectingPoint num="38" id="7362" />
+<TGConnectingPoint num="39" id="7363" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5670" >
-<cdparam x="228" y="288" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="7375" >
+<cdparam x="103" y="277" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state1" value="VerifyCert0" />
-<TGConnectingPoint num="0" id="5630" />
-<TGConnectingPoint num="1" id="5631" />
-<TGConnectingPoint num="2" id="5632" />
-<TGConnectingPoint num="3" id="5633" />
-<TGConnectingPoint num="4" id="5634" />
-<TGConnectingPoint num="5" id="5635" />
-<TGConnectingPoint num="6" id="5636" />
-<TGConnectingPoint num="7" id="5637" />
-<TGConnectingPoint num="8" id="5638" />
-<TGConnectingPoint num="9" id="5639" />
-<TGConnectingPoint num="10" id="5640" />
-<TGConnectingPoint num="11" id="5641" />
-<TGConnectingPoint num="12" id="5642" />
-<TGConnectingPoint num="13" id="5643" />
-<TGConnectingPoint num="14" id="5644" />
-<TGConnectingPoint num="15" id="5645" />
-<TGConnectingPoint num="16" id="5646" />
-<TGConnectingPoint num="17" id="5647" />
-<TGConnectingPoint num="18" id="5648" />
-<TGConnectingPoint num="19" id="5649" />
-<TGConnectingPoint num="20" id="5650" />
-<TGConnectingPoint num="21" id="5651" />
-<TGConnectingPoint num="22" id="5652" />
-<TGConnectingPoint num="23" id="5653" />
-<TGConnectingPoint num="24" id="5654" />
-<TGConnectingPoint num="25" id="5655" />
-<TGConnectingPoint num="26" id="5656" />
-<TGConnectingPoint num="27" id="5657" />
-<TGConnectingPoint num="28" id="5658" />
-<TGConnectingPoint num="29" id="5659" />
-<TGConnectingPoint num="30" id="5660" />
-<TGConnectingPoint num="31" id="5661" />
-<TGConnectingPoint num="32" id="5662" />
-<TGConnectingPoint num="33" id="5663" />
-<TGConnectingPoint num="34" id="5664" />
-<TGConnectingPoint num="35" id="5665" />
-<TGConnectingPoint num="36" id="5666" />
-<TGConnectingPoint num="37" id="5667" />
-<TGConnectingPoint num="38" id="5668" />
-<TGConnectingPoint num="39" id="5669" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m0)" />
+<TGConnectingPoint num="0" id="7365" />
+<TGConnectingPoint num="1" id="7366" />
+<TGConnectingPoint num="2" id="7367" />
+<TGConnectingPoint num="3" id="7368" />
+<TGConnectingPoint num="4" id="7369" />
+<TGConnectingPoint num="5" id="7370" />
+<TGConnectingPoint num="6" id="7371" />
+<TGConnectingPoint num="7" id="7372" />
+<TGConnectingPoint num="8" id="7373" />
+<TGConnectingPoint num="9" id="7374" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="5711" >
-<cdparam x="33" y="314" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="7416" >
+<cdparam x="64" y="321" />
+<sizeparam width="90" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts0" />
-<TGConnectingPoint num="0" id="5671" />
-<TGConnectingPoint num="1" id="5672" />
-<TGConnectingPoint num="2" id="5673" />
-<TGConnectingPoint num="3" id="5674" />
-<TGConnectingPoint num="4" id="5675" />
-<TGConnectingPoint num="5" id="5676" />
-<TGConnectingPoint num="6" id="5677" />
-<TGConnectingPoint num="7" id="5678" />
-<TGConnectingPoint num="8" id="5679" />
-<TGConnectingPoint num="9" id="5680" />
-<TGConnectingPoint num="10" id="5681" />
-<TGConnectingPoint num="11" id="5682" />
-<TGConnectingPoint num="12" id="5683" />
-<TGConnectingPoint num="13" id="5684" />
-<TGConnectingPoint num="14" id="5685" />
-<TGConnectingPoint num="15" id="5686" />
-<TGConnectingPoint num="16" id="5687" />
-<TGConnectingPoint num="17" id="5688" />
-<TGConnectingPoint num="18" id="5689" />
-<TGConnectingPoint num="19" id="5690" />
-<TGConnectingPoint num="20" id="5691" />
-<TGConnectingPoint num="21" id="5692" />
-<TGConnectingPoint num="22" id="5693" />
-<TGConnectingPoint num="23" id="5694" />
-<TGConnectingPoint num="24" id="5695" />
-<TGConnectingPoint num="25" id="5696" />
-<TGConnectingPoint num="26" id="5697" />
-<TGConnectingPoint num="27" id="5698" />
-<TGConnectingPoint num="28" id="5699" />
-<TGConnectingPoint num="29" id="5700" />
-<TGConnectingPoint num="30" id="5701" />
-<TGConnectingPoint num="31" id="5702" />
-<TGConnectingPoint num="32" id="5703" />
-<TGConnectingPoint num="33" id="5704" />
-<TGConnectingPoint num="34" id="5705" />
-<TGConnectingPoint num="35" id="5706" />
-<TGConnectingPoint num="36" id="5707" />
-<TGConnectingPoint num="37" id="5708" />
-<TGConnectingPoint num="38" id="5709" />
-<TGConnectingPoint num="39" id="5710" />
+<infoparam name="state0" value="ForgeMsg1" />
+<TGConnectingPoint num="0" id="7376" />
+<TGConnectingPoint num="1" id="7377" />
+<TGConnectingPoint num="2" id="7378" />
+<TGConnectingPoint num="3" id="7379" />
+<TGConnectingPoint num="4" id="7380" />
+<TGConnectingPoint num="5" id="7381" />
+<TGConnectingPoint num="6" id="7382" />
+<TGConnectingPoint num="7" id="7383" />
+<TGConnectingPoint num="8" id="7384" />
+<TGConnectingPoint num="9" id="7385" />
+<TGConnectingPoint num="10" id="7386" />
+<TGConnectingPoint num="11" id="7387" />
+<TGConnectingPoint num="12" id="7388" />
+<TGConnectingPoint num="13" id="7389" />
+<TGConnectingPoint num="14" id="7390" />
+<TGConnectingPoint num="15" id="7391" />
+<TGConnectingPoint num="16" id="7392" />
+<TGConnectingPoint num="17" id="7393" />
+<TGConnectingPoint num="18" id="7394" />
+<TGConnectingPoint num="19" id="7395" />
+<TGConnectingPoint num="20" id="7396" />
+<TGConnectingPoint num="21" id="7397" />
+<TGConnectingPoint num="22" id="7398" />
+<TGConnectingPoint num="23" id="7399" />
+<TGConnectingPoint num="24" id="7400" />
+<TGConnectingPoint num="25" id="7401" />
+<TGConnectingPoint num="26" id="7402" />
+<TGConnectingPoint num="27" id="7403" />
+<TGConnectingPoint num="28" id="7404" />
+<TGConnectingPoint num="29" id="7405" />
+<TGConnectingPoint num="30" id="7406" />
+<TGConnectingPoint num="31" id="7407" />
+<TGConnectingPoint num="32" id="7408" />
+<TGConnectingPoint num="33" id="7409" />
+<TGConnectingPoint num="34" id="7410" />
+<TGConnectingPoint num="35" id="7411" />
+<TGConnectingPoint num="36" id="7412" />
+<TGConnectingPoint num="37" id="7413" />
+<TGConnectingPoint num="38" id="7414" />
+<TGConnectingPoint num="39" id="7415" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="5752" >
-<cdparam x="49" y="183" />
-<sizeparam width="182" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="7457" >
+<cdparam x="46" y="205" />
+<sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts0" />
-<TGConnectingPoint num="0" id="5712" />
-<TGConnectingPoint num="1" id="5713" />
-<TGConnectingPoint num="2" id="5714" />
-<TGConnectingPoint num="3" id="5715" />
-<TGConnectingPoint num="4" id="5716" />
-<TGConnectingPoint num="5" id="5717" />
-<TGConnectingPoint num="6" id="5718" />
-<TGConnectingPoint num="7" id="5719" />
-<TGConnectingPoint num="8" id="5720" />
-<TGConnectingPoint num="9" id="5721" />
-<TGConnectingPoint num="10" id="5722" />
-<TGConnectingPoint num="11" id="5723" />
-<TGConnectingPoint num="12" id="5724" />
-<TGConnectingPoint num="13" id="5725" />
-<TGConnectingPoint num="14" id="5726" />
-<TGConnectingPoint num="15" id="5727" />
-<TGConnectingPoint num="16" id="5728" />
-<TGConnectingPoint num="17" id="5729" />
-<TGConnectingPoint num="18" id="5730" />
-<TGConnectingPoint num="19" id="5731" />
-<TGConnectingPoint num="20" id="5732" />
-<TGConnectingPoint num="21" id="5733" />
-<TGConnectingPoint num="22" id="5734" />
-<TGConnectingPoint num="23" id="5735" />
-<TGConnectingPoint num="24" id="5736" />
-<TGConnectingPoint num="25" id="5737" />
-<TGConnectingPoint num="26" id="5738" />
-<TGConnectingPoint num="27" id="5739" />
-<TGConnectingPoint num="28" id="5740" />
-<TGConnectingPoint num="29" id="5741" />
-<TGConnectingPoint num="30" id="5742" />
-<TGConnectingPoint num="31" id="5743" />
-<TGConnectingPoint num="32" id="5744" />
-<TGConnectingPoint num="33" id="5745" />
-<TGConnectingPoint num="34" id="5746" />
-<TGConnectingPoint num="35" id="5747" />
-<TGConnectingPoint num="36" id="5748" />
-<TGConnectingPoint num="37" id="5749" />
-<TGConnectingPoint num="38" id="5750" />
-<TGConnectingPoint num="39" id="5751" />
+<infoparam name="state0" value="SendMsg0" />
+<TGConnectingPoint num="0" id="7417" />
+<TGConnectingPoint num="1" id="7418" />
+<TGConnectingPoint num="2" id="7419" />
+<TGConnectingPoint num="3" id="7420" />
+<TGConnectingPoint num="4" id="7421" />
+<TGConnectingPoint num="5" id="7422" />
+<TGConnectingPoint num="6" id="7423" />
+<TGConnectingPoint num="7" id="7424" />
+<TGConnectingPoint num="8" id="7425" />
+<TGConnectingPoint num="9" id="7426" />
+<TGConnectingPoint num="10" id="7427" />
+<TGConnectingPoint num="11" id="7428" />
+<TGConnectingPoint num="12" id="7429" />
+<TGConnectingPoint num="13" id="7430" />
+<TGConnectingPoint num="14" id="7431" />
+<TGConnectingPoint num="15" id="7432" />
+<TGConnectingPoint num="16" id="7433" />
+<TGConnectingPoint num="17" id="7434" />
+<TGConnectingPoint num="18" id="7435" />
+<TGConnectingPoint num="19" id="7436" />
+<TGConnectingPoint num="20" id="7437" />
+<TGConnectingPoint num="21" id="7438" />
+<TGConnectingPoint num="22" id="7439" />
+<TGConnectingPoint num="23" id="7440" />
+<TGConnectingPoint num="24" id="7441" />
+<TGConnectingPoint num="25" id="7442" />
+<TGConnectingPoint num="26" id="7443" />
+<TGConnectingPoint num="27" id="7444" />
+<TGConnectingPoint num="28" id="7445" />
+<TGConnectingPoint num="29" id="7446" />
+<TGConnectingPoint num="30" id="7447" />
+<TGConnectingPoint num="31" id="7448" />
+<TGConnectingPoint num="32" id="7449" />
+<TGConnectingPoint num="33" id="7450" />
+<TGConnectingPoint num="34" id="7451" />
+<TGConnectingPoint num="35" id="7452" />
+<TGConnectingPoint num="36" id="7453" />
+<TGConnectingPoint num="37" id="7454" />
+<TGConnectingPoint num="38" id="7455" />
+<TGConnectingPoint num="39" id="7456" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="5763" >
-<cdparam x="106" y="126" />
-<sizeparam width="68" 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="2900" />
-<infoparam name="Receive signal" value="chin(m0)" />
-<TGConnectingPoint num="0" id="5753" />
-<TGConnectingPoint num="1" id="5754" />
-<TGConnectingPoint num="2" id="5755" />
-<TGConnectingPoint num="3" id="5756" />
-<TGConnectingPoint num="4" id="5757" />
-<TGConnectingPoint num="5" id="5758" />
-<TGConnectingPoint num="6" id="5759" />
-<TGConnectingPoint num="7" id="5760" />
-<TGConnectingPoint num="8" id="5761" />
-<TGConnectingPoint num="9" id="5762" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="5804" >
-<cdparam x="50" y="58" />
-<sizeparam width="181" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="7498" >
+<cdparam x="39" y="65" />
+<sizeparam width="98" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg0" />
-<TGConnectingPoint num="0" id="5764" />
-<TGConnectingPoint num="1" id="5765" />
-<TGConnectingPoint num="2" id="5766" />
-<TGConnectingPoint num="3" id="5767" />
-<TGConnectingPoint num="4" id="5768" />
-<TGConnectingPoint num="5" id="5769" />
-<TGConnectingPoint num="6" id="5770" />
-<TGConnectingPoint num="7" id="5771" />
-<TGConnectingPoint num="8" id="5772" />
-<TGConnectingPoint num="9" id="5773" />
-<TGConnectingPoint num="10" id="5774" />
-<TGConnectingPoint num="11" id="5775" />
-<TGConnectingPoint num="12" id="5776" />
-<TGConnectingPoint num="13" id="5777" />
-<TGConnectingPoint num="14" id="5778" />
-<TGConnectingPoint num="15" id="5779" />
-<TGConnectingPoint num="16" id="5780" />
-<TGConnectingPoint num="17" id="5781" />
-<TGConnectingPoint num="18" id="5782" />
-<TGConnectingPoint num="19" id="5783" />
-<TGConnectingPoint num="20" id="5784" />
-<TGConnectingPoint num="21" id="5785" />
-<TGConnectingPoint num="22" id="5786" />
-<TGConnectingPoint num="23" id="5787" />
-<TGConnectingPoint num="24" id="5788" />
-<TGConnectingPoint num="25" id="5789" />
-<TGConnectingPoint num="26" id="5790" />
-<TGConnectingPoint num="27" id="5791" />
-<TGConnectingPoint num="28" id="5792" />
-<TGConnectingPoint num="29" id="5793" />
-<TGConnectingPoint num="30" id="5794" />
-<TGConnectingPoint num="31" id="5795" />
-<TGConnectingPoint num="32" id="5796" />
-<TGConnectingPoint num="33" id="5797" />
-<TGConnectingPoint num="34" id="5798" />
-<TGConnectingPoint num="35" id="5799" />
-<TGConnectingPoint num="36" id="5800" />
-<TGConnectingPoint num="37" id="5801" />
-<TGConnectingPoint num="38" id="5802" />
-<TGConnectingPoint num="39" id="5803" />
+<infoparam name="state0" value="ForgeMsg0" />
+<TGConnectingPoint num="0" id="7458" />
+<TGConnectingPoint num="1" id="7459" />
+<TGConnectingPoint num="2" id="7460" />
+<TGConnectingPoint num="3" id="7461" />
+<TGConnectingPoint num="4" id="7462" />
+<TGConnectingPoint num="5" id="7463" />
+<TGConnectingPoint num="6" id="7464" />
+<TGConnectingPoint num="7" id="7465" />
+<TGConnectingPoint num="8" id="7466" />
+<TGConnectingPoint num="9" id="7467" />
+<TGConnectingPoint num="10" id="7468" />
+<TGConnectingPoint num="11" id="7469" />
+<TGConnectingPoint num="12" id="7470" />
+<TGConnectingPoint num="13" id="7471" />
+<TGConnectingPoint num="14" id="7472" />
+<TGConnectingPoint num="15" id="7473" />
+<TGConnectingPoint num="16" id="7474" />
+<TGConnectingPoint num="17" id="7475" />
+<TGConnectingPoint num="18" id="7476" />
+<TGConnectingPoint num="19" id="7477" />
+<TGConnectingPoint num="20" id="7478" />
+<TGConnectingPoint num="21" id="7479" />
+<TGConnectingPoint num="22" id="7480" />
+<TGConnectingPoint num="23" id="7481" />
+<TGConnectingPoint num="24" id="7482" />
+<TGConnectingPoint num="25" id="7483" />
+<TGConnectingPoint num="26" id="7484" />
+<TGConnectingPoint num="27" id="7485" />
+<TGConnectingPoint num="28" id="7486" />
+<TGConnectingPoint num="29" id="7487" />
+<TGConnectingPoint num="30" id="7488" />
+<TGConnectingPoint num="31" id="7489" />
+<TGConnectingPoint num="32" id="7490" />
+<TGConnectingPoint num="33" id="7491" />
+<TGConnectingPoint num="34" id="7492" />
+<TGConnectingPoint num="35" id="7493" />
+<TGConnectingPoint num="36" id="7494" />
+<TGConnectingPoint num="37" id="7495" />
+<TGConnectingPoint num="38" id="7496" />
+<TGConnectingPoint num="39" id="7497" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="5806" >
-<cdparam x="133" y="25" />
+<COMPONENT type="5100" id="7500" >
+<cdparam x="67" 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="1400" minY="10" maxY="2900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="5805" />
+<TGConnectingPoint num="0" id="7499" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="ECU1" minX="10" maxX="1400" minY="10" maxY="2900" >
-<CONNECTOR type="118" id="5807" >
-<cdparam x="741" y="2090" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="741" y="2090" id="6374" />
-<P2  x="630" y="2102" id="6424" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="118" id="5808" >
-<cdparam x="729" y="1796" />
+<AVATARStateMachineDiagramPanel name="ECU2" minX="10" maxX="1400" minY="10" maxY="2900" >
+<CONNECTOR type="118" id="4053" >
+<cdparam x="692" y="1924" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="729" y="1796" id="6484" />
-<P2  x="643" y="1806" id="6534" />
+<P1  x="692" y="1924" id="4643" />
+<P2  x="590" y="1936" id="4693" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="5809" >
-<cdparam x="557" y="1335" />
+<CONNECTOR type="118" id="4054" >
+<cdparam x="556" y="1263" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="557" y="1335" id="6799" />
-<P2  x="449" y="1349" id="6849" />
+<P1  x="556" y="1263" id="4969" />
+<P2  x="475" y="1272" id="5019" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="5810" >
-<cdparam x="526" y="1036" />
+<CONNECTOR type="5102" id="4061" >
+<cdparam x="434" y="1028" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="526" y="1036" id="6909" />
-<P2  x="438" y="1044" id="6959" />
-<AutomaticDrawing  data="false" />
-</CONNECTOR>
-<CONNECTOR type="118" id="5811" >
-<cdparam x="266" y="570" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4060" />
+<P1  x="434" y="1028" id="5133" />
+<P2  x="429" y="1137" id="5036" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4059" >
+<father id="4061" num="0" />
+<cdparam x="436" y="1050" />
+<sizeparam width="168" height="90" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4055" />
+<TGConnectingPoint num="1" id="4056" />
+<TGConnectingPoint num="2" id="4057" />
+<TGConnectingPoint num="3" id="4058" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="tmp1 = sign(idk2pk,mvksk)" />
+<actions value="tmp2 = cert(idk2pk,tmp1)" />
+<actions value="tmp3.data = ts2" />
+<actions value="tmp4 = concat2(tmp2,tmp3)" />
+<actions value="tmp5 = sign(tmp4,idk2sk)" />
+<actions value="m2 = concat2(tmp4,tmp5)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="118" id="4062" >
+<cdparam x="546" y="1000" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="266" y="570" id="7172" />
-<P2  x="127" y="575" id="7308" />
+<P1  x="546" y="1000" id="5079" />
+<P2  x="484" y="1003" id="5163" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="5812" >
-<cdparam x="334" y="333" />
+<CONNECTOR type="118" id="4063" >
+<cdparam x="453" y="572" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from UML Note to state0" value="null" />
-<P1  x="277" y="335" id="7189" />
-<P2  x="154" y="346" id="7412" />
+<infoparam name="connector from UML Note to state1" value="null" />
+<P1  x="453" y="572" id="5096" />
+<P2  x="360" y="584" id="5502" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="118" id="5813" >
-<cdparam x="175" y="86" />
+<CONNECTOR type="118" id="4064" >
+<cdparam x="231" y="83" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to UML Note" value="null" />
-<P1  x="137" y="90" id="7494" />
-<P2  x="278" y="76" id="7206" />
+<P1  x="231" y="83" id="5800" />
+<P2  x="272" y="83" id="5113" />
 <AutomaticDrawing  data="false" />
 </CONNECTOR>
-<CONNECTOR type="5102" id="5820" >
-<cdparam x="428" y="180" />
+<CONNECTOR type="5102" id="4071" >
+<cdparam x="277" y="445" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5819" />
-<P1  x="88" y="115" id="7464" />
-<P2  x="103" y="205" id="7418" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4070" />
+<P1  x="302" y="434" id="5387" />
+<P2  x="302" y="479" id="5566" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4069" >
+<father id="4071" num="0" />
+<cdparam x="314" y="453" />
+<sizeparam width="198" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4065" />
+<TGConnectingPoint num="1" id="4066" />
+<TGConnectingPoint num="2" id="4067" />
+<TGConnectingPoint num="3" id="4068" />
+<extraparam>
+<guard value="[ ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+<actions value="idk1Pk = getpk(tmp2)" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4078" >
+<cdparam x="447" y="71" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from start state to state0" value="null" />
+<TGConnectingPoint num="0" id="4077" />
+<P1  x="140" y="45" id="5805" />
+<P2  x="140" y="58" id="5765" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5818" >
-<father id="5820" num="0" />
-<cdparam x="123" y="126" />
-<sizeparam width="213" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4076" >
+<father id="4078" num="0" />
+<cdparam x="447" y="111" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5814" />
-<TGConnectingPoint num="1" id="5815" />
-<TGConnectingPoint num="2" id="5816" />
-<TGConnectingPoint num="3" id="5817" />
+<TGConnectingPoint num="0" id="4072" />
+<TGConnectingPoint num="1" id="4073" />
+<TGConnectingPoint num="2" id="4074" />
+<TGConnectingPoint num="3" id="4075" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1 = sign(idk1pk, mvksk)" />
-<actions value="tmp2 = cert(idk1pk, tmp1)" />
-<actions value="tmp3.data = ts0" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m0 = concat2(tmp4,tmp5)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5827" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="4085" >
+<cdparam x="447" y="158" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from start state to state0" value="null" />
-<TGConnectingPoint num="0" id="5826" />
-<P1  x="74" y="47" id="7499" />
-<P2  x="75" y="65" id="7475" />
+<infoparam name="connector from state0 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="4084" />
+<P1  x="140" y="108" id="5770" />
+<P2  x="140" y="121" id="5753" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5825" >
-<father id="5827" num="0" />
-<cdparam x="407" y="110" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4083" >
+<father id="4085" num="0" />
+<cdparam x="447" y="198" />
 <sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5821" />
-<TGConnectingPoint num="1" id="5822" />
-<TGConnectingPoint num="2" id="5823" />
-<TGConnectingPoint num="3" id="5824" />
+<TGConnectingPoint num="0" id="4079" />
+<TGConnectingPoint num="1" id="4080" />
+<TGConnectingPoint num="2" id="4081" />
+<TGConnectingPoint num="3" id="4082" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -10887,55 +10290,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5834" >
-<cdparam x="451" y="341" />
+<CONNECTOR type="5102" id="4092" >
+<cdparam x="451" y="236" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5833" />
-<P1  x="116" y="255" id="7447" />
-<P2  x="137" y="272" id="7365" />
+<infoparam name="connector from Receive signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4091" />
+<P1  x="140" y="151" id="5754" />
+<P2  x="140" y="183" id="5713" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5832" >
-<father id="5834" num="0" />
-<cdparam x="451" y="381" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4090" >
+<father id="4092" num="0" />
+<cdparam x="187" y="157" />
+<sizeparam width="163" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5828" />
-<TGConnectingPoint num="1" id="5829" />
-<TGConnectingPoint num="2" id="5830" />
-<TGConnectingPoint num="3" id="5831" />
+<TGConnectingPoint num="0" id="4086" />
+<TGConnectingPoint num="1" id="4087" />
+<TGConnectingPoint num="2" id="4088" />
+<TGConnectingPoint num="3" id="4089" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m0, tmp4, tmp5)" />
+<actions value="get2(tmp4, tmp2, tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5841" >
-<cdparam x="445" y="417" />
+<CONNECTOR type="5102" id="4099" >
+<cdparam x="95" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5840" />
-<P1  x="137" y="302" id="7366" />
-<P2  x="119" y="321" id="7394" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4098" />
+<P1  x="94" y="233" id="5726" />
+<P2  x="95" y="314" id="5689" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5839" >
-<father id="5841" num="0" />
-<cdparam x="445" y="457" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4097" >
+<father id="4099" num="0" />
+<cdparam x="25" y="274" />
+<sizeparam width="149" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5835" />
-<TGConnectingPoint num="1" id="5836" />
-<TGConnectingPoint num="2" id="5837" />
-<TGConnectingPoint num="3" id="5838" />
+<TGConnectingPoint num="0" id="4093" />
+<TGConnectingPoint num="1" id="4094" />
+<TGConnectingPoint num="2" id="4095" />
+<TGConnectingPoint num="3" id="4096" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(tmp3.data == ts0) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -10943,61 +10348,56 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5848" >
-<cdparam x="146" y="365" />
+<CONNECTOR type="5102" id="4106" >
+<cdparam x="232" y="304" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5847" />
-<P1  x="119" y="371" id="7406" />
-<P2  x="85" y="436" id="7325" />
+<infoparam name="connector from state0 to state1" value="null" />
+<TGConnectingPoint num="0" id="4105" />
+<P1  x="231" y="233" id="5719" />
+<P2  x="253" y="288" id="5638" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5846" >
-<father id="5848" num="0" />
-<cdparam x="141" y="390" />
-<sizeparam width="203" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4104" >
+<father id="4106" num="0" />
+<cdparam x="246" y="255" />
+<sizeparam width="163" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5842" />
-<TGConnectingPoint num="1" id="5843" />
-<TGConnectingPoint num="2" id="5844" />
-<TGConnectingPoint num="3" id="5845" />
+<TGConnectingPoint num="0" id="4100" />
+<TGConnectingPoint num="1" id="4101" />
+<TGConnectingPoint num="2" id="4102" />
+<TGConnectingPoint num="3" id="4103" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp3.data == ts0 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = rpk" />
-<actions value="tmp2.data = ecu2id" />
-<actions value="tmp3.data = ts1" />
-<actions value="tmp4 = concat3(tmp1,tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m1 = concat2(tmp4,tmp5)" />
+<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5855" >
-<cdparam x="97" y="486" />
+<CONNECTOR type="5102" id="4113" >
+<cdparam x="231" y="423" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5854" />
-<P1  x="97" y="486" id="7354" />
-<P2  x="91" y="503" id="7313" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4112" />
+<P1  x="240" y="338" id="5658" />
+<P2  x="184" y="395" id="5607" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5853" >
-<father id="5855" num="0" />
-<cdparam x="97" y="526" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4111" >
+<father id="4113" num="0" />
+<cdparam x="146" y="380" />
+<sizeparam width="50" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5849" />
-<TGConnectingPoint num="1" id="5850" />
-<TGConnectingPoint num="2" id="5851" />
-<TGConnectingPoint num="3" id="5852" />
+<TGConnectingPoint num="0" id="4107" />
+<TGConnectingPoint num="1" id="4108" />
+<TGConnectingPoint num="2" id="4109" />
+<TGConnectingPoint num="3" id="4110" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11005,27 +10405,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5862" >
-<cdparam x="91" y="533" />
+<CONNECTOR type="5102" id="4120" >
+<cdparam x="331" y="423" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5861" />
-<P1  x="91" y="533" id="7314" />
-<P2  x="52" y="550" id="7280" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4119" />
+<P1  x="290" y="338" id="5660" />
+<P2  x="302" y="384" id="5381" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5860" >
-<father id="5862" num="0" />
-<cdparam x="91" y="573" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4118" >
+<father id="4120" num="0" />
+<cdparam x="306" y="367" />
+<sizeparam width="167" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5856" />
-<TGConnectingPoint num="1" id="5857" />
-<TGConnectingPoint num="2" id="5858" />
-<TGConnectingPoint num="3" id="5859" />
+<TGConnectingPoint num="0" id="4114" />
+<TGConnectingPoint num="1" id="4115" />
+<TGConnectingPoint num="2" id="4116" />
+<TGConnectingPoint num="3" id="4117" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11033,27 +10433,55 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5869" >
-<cdparam x="89" y="600" />
+<CONNECTOR type="5102" id="4127" >
+<cdparam x="243" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5868" />
-<P1  x="89" y="600" id="7302" />
-<P2  x="83" y="616" id="7261" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4126" />
+<P1  x="240" y="529" id="5553" />
+<P2  x="118" y="560" id="5509" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5867" >
-<father id="5869" num="0" />
-<cdparam x="89" y="640" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4125" >
+<father id="4127" num="0" />
+<cdparam x="96" y="536" />
+<sizeparam width="50" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5863" />
-<TGConnectingPoint num="1" id="5864" />
-<TGConnectingPoint num="2" id="5865" />
-<TGConnectingPoint num="3" id="5866" />
+<TGConnectingPoint num="0" id="4121" />
+<TGConnectingPoint num="1" id="4122" />
+<TGConnectingPoint num="2" id="4123" />
+<TGConnectingPoint num="3" id="4124" />
+<extraparam>
+<guard value="[ not(b) ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4134" >
+<cdparam x="343" y="476" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state1 to state1" value="null" />
+<TGConnectingPoint num="0" id="4133" />
+<P1  x="315" y="529" id="5563" />
+<P2  x="271" y="559" id="5474" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4132" >
+<father id="4134" num="0" />
+<cdparam x="270" y="544" />
+<sizeparam width="24" 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="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4128" />
+<TGConnectingPoint num="1" id="4129" />
+<TGConnectingPoint num="2" id="4130" />
+<TGConnectingPoint num="3" id="4131" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11061,172 +10489,170 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5876" >
-<cdparam x="83" y="646" />
+<CONNECTOR type="5102" id="4141" >
+<cdparam x="317" y="568" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5875" />
-<P1  x="83" y="646" id="7262" />
-<P2  x="124" y="699" id="7236" />
+<infoparam name="connector from state1 to Receive signal" value="null" />
+<TGConnectingPoint num="0" id="4140" />
+<P1  x="315" y="609" id="5496" />
+<P2  x="250" y="624" id="5455" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5874" >
-<father id="5876" num="0" />
-<cdparam x="114" y="662" />
-<sizeparam width="135" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4139" >
+<father id="4141" num="0" />
+<cdparam x="303" y="638" />
+<sizeparam width="10" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5870" />
-<TGConnectingPoint num="1" id="5871" />
-<TGConnectingPoint num="2" id="5872" />
-<TGConnectingPoint num="3" id="5873" />
+<TGConnectingPoint num="0" id="4135" />
+<TGConnectingPoint num="1" id="4136" />
+<TGConnectingPoint num="2" id="4137" />
+<TGConnectingPoint num="3" id="4138" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m2,tmp4,tmp5)" />
-<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5883" >
-<cdparam x="112" y="749" />
+<CONNECTOR type="5102" id="4148" >
+<cdparam x="313" y="621" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5882" />
-<P1  x="112" y="749" id="7225" />
-<P2  x="89" y="809" id="7146" />
+<infoparam name="connector from Receive signal to state1" value="null" />
+<TGConnectingPoint num="0" id="4147" />
+<P1  x="250" y="654" id="5456" />
+<P2  x="201" y="687" id="5430" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5881" >
-<father id="5883" num="0" />
-<cdparam x="12" y="775" />
-<sizeparam width="145" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4146" >
+<father id="4148" num="0" />
+<cdparam x="271" y="666" />
+<sizeparam width="170" 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="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5877" />
-<TGConnectingPoint num="1" id="5878" />
-<TGConnectingPoint num="2" id="5879" />
-<TGConnectingPoint num="3" id="5880" />
+<TGConnectingPoint num="0" id="4142" />
+<TGConnectingPoint num="1" id="4143" />
+<TGConnectingPoint num="2" id="4144" />
+<TGConnectingPoint num="3" id="4145" />
 <extraparam>
-<guard value="[ not(tmp3.data == ts2)]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="get2(m1,tmp4,tmp5)" />
+<actions value="get3(tmp4,tmp1,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5890" >
-<cdparam x="212" y="749" />
+<CONNECTOR type="5102" id="4155" >
+<cdparam x="189" y="737" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5889" />
-<P1  x="212" y="749" id="7227" />
-<P2  x="198" y="809" id="7087" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4154" />
+<P1  x="201" y="737" id="5442" />
+<P2  x="163" y="778" id="5334" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5888" >
-<father id="5890" num="0" />
-<cdparam x="212" y="777" />
-<sizeparam width="163" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4153" >
+<father id="4155" num="0" />
+<cdparam x="34" y="748" />
+<sizeparam width="149" 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" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5884" />
-<TGConnectingPoint num="1" id="5885" />
-<TGConnectingPoint num="2" id="5886" />
-<TGConnectingPoint num="3" id="5887" />
+<TGConnectingPoint num="0" id="4149" />
+<TGConnectingPoint num="1" id="4150" />
+<TGConnectingPoint num="2" id="4151" />
+<TGConnectingPoint num="3" id="4152" />
 <extraparam>
-<guard value="[ tmp3.data == ts2 ]" />
+<guard value="[ not(tmp3.data == ts1) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyCert(tmp2,mvkpk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5897" >
-<cdparam x="198" y="859" />
+<CONNECTOR type="5102" id="4162" >
+<cdparam x="289" y="737" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5896" />
-<P1  x="198" y="859" id="7092" />
-<P2  x="149" y="914" id="7047" />
+<infoparam name="connector from state1 to state0" value="null" />
+<TGConnectingPoint num="0" id="4161" />
+<P1  x="264" y="737" id="5429" />
+<P2  x="292" y="778" id="5299" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5895" >
-<father id="5897" num="0" />
-<cdparam x="111" y="886" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4160" >
+<father id="4162" num="0" />
+<cdparam x="288" y="752" />
+<sizeparam width="198" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5891" />
-<TGConnectingPoint num="1" id="5892" />
-<TGConnectingPoint num="2" id="5893" />
-<TGConnectingPoint num="3" id="5894" />
+<TGConnectingPoint num="0" id="4156" />
+<TGConnectingPoint num="1" id="4157" />
+<TGConnectingPoint num="2" id="4158" />
+<TGConnectingPoint num="3" id="4159" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ tmp3.data == ts1 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5904" >
-<cdparam x="298" y="859" />
+<CONNECTOR type="5102" id="4169" >
+<cdparam x="267" y="828" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5903" />
-<P1  x="298" y="859" id="7094" />
-<P2  x="290" y="914" id="7021" />
+<TGConnectingPoint num="0" id="4168" />
+<P1  x="279" y="828" id="5319" />
+<P2  x="249" y="877" id="5252" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5902" >
-<father id="5904" num="0" />
-<cdparam x="303" y="873" />
-<sizeparam width="198" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4167" >
+<father id="4169" num="0" />
+<cdparam x="187" y="850" />
+<sizeparam width="151" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5898" />
-<TGConnectingPoint num="1" id="5899" />
-<TGConnectingPoint num="2" id="5900" />
-<TGConnectingPoint num="3" id="5901" />
+<TGConnectingPoint num="0" id="4163" />
+<TGConnectingPoint num="1" id="4164" />
+<TGConnectingPoint num="2" id="4165" />
+<TGConnectingPoint num="3" id="4166" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(b) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="idk2Pk = getpk(tmp2)" />
-<actions value="b = verifySign(tmp4,tmp5,idk2Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5911" >
-<cdparam x="199" y="964" />
+<CONNECTOR type="5102" id="4176" >
+<cdparam x="367" y="828" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5910" />
-<P1  x="278" y="964" id="7010" />
-<P2  x="185" y="1019" id="6972" />
+<TGConnectingPoint num="0" id="4175" />
+<P1  x="342" y="828" id="5306" />
+<P2  x="354" y="880" id="5217" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5909" >
-<father id="5911" num="0" />
-<cdparam x="169" y="993" />
-<sizeparam width="50" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4174" >
+<father id="4176" num="0" />
+<cdparam x="368" y="850" />
+<sizeparam width="198" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5905" />
-<TGConnectingPoint num="1" id="5906" />
-<TGConnectingPoint num="2" id="5907" />
-<TGConnectingPoint num="3" id="5908" />
+<TGConnectingPoint num="0" id="4170" />
+<TGConnectingPoint num="1" id="4171" />
+<TGConnectingPoint num="2" id="4172" />
+<TGConnectingPoint num="3" id="4173" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11234,27 +10660,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5918" >
-<cdparam x="378" y="964" />
+<CONNECTOR type="5102" id="4183" >
+<cdparam x="329" y="930" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5917" />
-<P1  x="378" y="964" id="7012" />
-<P2  x="388" y="1019" id="6924" />
+<TGConnectingPoint num="0" id="4182" />
+<P1  x="341" y="930" id="5237" />
+<P2  x="290" y="980" id="5187" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5916" >
-<father id="5918" num="0" />
-<cdparam x="388" y="985" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4181" >
+<father id="4183" num="0" />
+<cdparam x="159" y="957" />
+<sizeparam width="151" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5912" />
-<TGConnectingPoint num="1" id="5913" />
-<TGConnectingPoint num="2" id="5914" />
-<TGConnectingPoint num="3" id="5915" />
+<TGConnectingPoint num="0" id="4177" />
+<TGConnectingPoint num="1" id="4178" />
+<TGConnectingPoint num="2" id="4179" />
+<TGConnectingPoint num="3" id="4180" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ not(tmp1.data == rpk) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11262,59 +10688,53 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5925" >
-<cdparam x="425" y="1069" />
+<CONNECTOR type="5102" id="4190" >
+<cdparam x="429" y="930" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5924" />
-<P1  x="388" y="1069" id="6929" />
-<P2  x="385" y="1185" id="6866" />
+<TGConnectingPoint num="0" id="4189" />
+<P1  x="404" y="930" id="5224" />
+<P2  x="434" y="978" id="5128" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5923" >
-<father id="5925" num="0" />
-<cdparam x="402" y="1087" />
-<sizeparam width="199" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4188" >
+<father id="4190" num="0" />
+<cdparam x="443" y="958" />
+<sizeparam width="125" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5919" />
-<TGConnectingPoint num="1" id="5920" />
-<TGConnectingPoint num="2" id="5921" />
-<TGConnectingPoint num="3" id="5922" />
+<TGConnectingPoint num="0" id="4184" />
+<TGConnectingPoint num="1" id="4185" />
+<TGConnectingPoint num="2" id="4186" />
+<TGConnectingPoint num="3" id="4187" />
 <extraparam>
-<guard value="[ ]" />
+<guard value="[ tmp1.data == rpk ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
-<computeMax value="" />
-<actions value="tmp1.data = SesK.data" />
-<actions value="tmp2 = aencrypt(tmp1,idk2Pk)" />
-<actions value="tmp3.data = ts3" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = sign(tmp4,idk1sk)" />
-<actions value="m3 = concat2(tmp4,tmp5)" />
+<computeMax value="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5932" >
-<cdparam x="397" y="1235" />
+<CONNECTOR type="5102" id="4197" >
+<cdparam x="429" y="1187" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="5931" />
-<P1  x="397" y="1235" id="6895" />
-<P2  x="392" y="1257" id="6854" />
+<TGConnectingPoint num="0" id="4196" />
+<P1  x="429" y="1187" id="5041" />
+<P2  x="434" y="1192" id="5024" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5930" >
-<father id="5932" num="0" />
-<cdparam x="397" y="1275" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4195" >
+<father id="4197" num="0" />
+<cdparam x="429" y="1227" />
 <sizeparam width="10" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5926" />
-<TGConnectingPoint num="1" id="5927" />
-<TGConnectingPoint num="2" id="5928" />
-<TGConnectingPoint num="3" id="5929" />
+<TGConnectingPoint num="0" id="4191" />
+<TGConnectingPoint num="1" id="4192" />
+<TGConnectingPoint num="2" id="4193" />
+<TGConnectingPoint num="3" id="4194" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11324,25 +10744,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5939" >
-<cdparam x="392" y="1287" />
+<CONNECTOR type="5102" id="4204" >
+<cdparam x="434" y="1222" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5938" />
-<P1  x="392" y="1287" id="6855" />
-<P2  x="399" y="1324" id="6814" />
+<TGConnectingPoint num="0" id="4203" />
+<P1  x="434" y="1222" id="5025" />
+<P2  x="412" y="1247" id="5000" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5937" >
-<father id="5939" num="0" />
-<cdparam x="408" y="1300" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4202" >
+<father id="4204" num="0" />
+<cdparam x="434" y="1262" />
 <sizeparam width="10" 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="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5933" />
-<TGConnectingPoint num="1" id="5934" />
-<TGConnectingPoint num="2" id="5935" />
-<TGConnectingPoint num="3" id="5936" />
+<TGConnectingPoint num="0" id="4198" />
+<TGConnectingPoint num="1" id="4199" />
+<TGConnectingPoint num="2" id="4200" />
+<TGConnectingPoint num="3" id="4201" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11352,25 +10772,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5946" >
-<cdparam x="386" y="1374" />
+<CONNECTOR type="5102" id="4211" >
+<cdparam x="412" y="1297" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="5945" />
-<P1  x="386" y="1374" id="6842" />
-<P2  x="390" y="1405" id="6785" />
+<TGConnectingPoint num="0" id="4210" />
+<P1  x="412" y="1297" id="5012" />
+<P2  x="412" y="1311" id="4955" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5944" >
-<father id="5946" num="0" />
-<cdparam x="386" y="1414" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4209" >
+<father id="4211" num="0" />
+<cdparam x="412" y="1337" />
 <sizeparam width="10" 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="1900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5940" />
-<TGConnectingPoint num="1" id="5941" />
-<TGConnectingPoint num="2" id="5942" />
-<TGConnectingPoint num="3" id="5943" />
+<TGConnectingPoint num="0" id="4205" />
+<TGConnectingPoint num="1" id="4206" />
+<TGConnectingPoint num="2" id="4207" />
+<TGConnectingPoint num="3" id="4208" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11380,57 +10800,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5953" >
-<cdparam x="390" y="1435" />
+<CONNECTOR type="5102" id="4218" >
+<cdparam x="412" y="1341" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="5952" />
-<P1  x="390" y="1435" id="6786" />
-<P2  x="400" y="1491" id="6745" />
+<TGConnectingPoint num="0" id="4217" />
+<P1  x="412" y="1341" id="4956" />
+<P2  x="406" y="1402" id="4915" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5951" >
-<father id="5953" num="0" />
-<cdparam x="406" y="1456" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4216" >
+<father id="4218" num="0" />
+<cdparam x="420" y="1366" />
 <sizeparam width="135" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5947" />
-<TGConnectingPoint num="1" id="5948" />
-<TGConnectingPoint num="2" id="5949" />
-<TGConnectingPoint num="3" id="5950" />
+<TGConnectingPoint num="0" id="4212" />
+<TGConnectingPoint num="1" id="4213" />
+<TGConnectingPoint num="2" id="4214" />
+<TGConnectingPoint num="3" id="4215" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m4,tmp3,tmp4)" />
-<actions value="get2(tmp3,tmp1,tmp2)" />
+<actions value="get2(m3,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5960" >
-<cdparam x="350" y="1541" />
+<CONNECTOR type="5102" id="4225" >
+<cdparam x="356" y="1452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5959" />
-<P1  x="350" y="1541" id="6749" />
-<P2  x="327" y="1579" id="6705" />
+<TGConnectingPoint num="0" id="4224" />
+<P1  x="368" y="1452" id="4942" />
+<P2  x="326" y="1507" id="4891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5958" >
-<father id="5960" num="0" />
-<cdparam x="184" y="1554" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4223" >
+<father id="4225" num="0" />
+<cdparam x="188" y="1471" />
 <sizeparam width="149" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5954" />
-<TGConnectingPoint num="1" id="5955" />
-<TGConnectingPoint num="2" id="5956" />
-<TGConnectingPoint num="3" id="5957" />
+<TGConnectingPoint num="0" id="4219" />
+<TGConnectingPoint num="1" id="4220" />
+<TGConnectingPoint num="2" id="4221" />
+<TGConnectingPoint num="3" id="4222" />
 <extraparam>
-<guard value="[ not(tmp2.data == ts4) ]" />
+<guard value="[ not(tmp3.data == ts3) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11438,54 +10858,54 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5967" >
-<cdparam x="450" y="1541" />
+<CONNECTOR type="5102" id="4232" >
+<cdparam x="456" y="1452" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5966" />
-<P1  x="450" y="1541" id="6751" />
-<P2  x="454" y="1583" id="6670" />
+<TGConnectingPoint num="0" id="4231" />
+<P1  x="431" y="1452" id="4929" />
+<P2  x="446" y="1506" id="4840" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5965" >
-<father id="5967" num="0" />
-<cdparam x="459" y="1556" />
-<sizeparam width="198" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4230" >
+<father id="4232" num="0" />
+<cdparam x="443" y="1474" />
+<sizeparam width="199" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5961" />
-<TGConnectingPoint num="1" id="5962" />
-<TGConnectingPoint num="2" id="5963" />
-<TGConnectingPoint num="3" id="5964" />
+<TGConnectingPoint num="0" id="4226" />
+<TGConnectingPoint num="1" id="4227" />
+<TGConnectingPoint num="2" id="4228" />
+<TGConnectingPoint num="3" id="4229" />
 <extraparam>
-<guard value="[ tmp2.data == ts4 ]" />
+<guard value="[ tmp3.data == ts3 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifySign(tmp3,tmp4,idk2Pk)" />
+<actions value="b = verifySign(tmp4,tmp5,idk1Pk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5974" >
-<cdparam x="429" y="1633" />
+<CONNECTOR type="5102" id="4239" >
+<cdparam x="421" y="1565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5973" />
-<P1  x="429" y="1633" id="6667" />
-<P2  x="393" y="1673" id="6640" />
+<TGConnectingPoint num="0" id="4238" />
+<P1  x="433" y="1556" id="4860" />
+<P2  x="388" y="1623" id="4809" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5972" >
-<father id="5974" num="0" />
-<cdparam x="346" y="1656" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4237" >
+<father id="4239" num="0" />
+<cdparam x="348" y="1589" />
 <sizeparam width="50" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5968" />
-<TGConnectingPoint num="1" id="5969" />
-<TGConnectingPoint num="2" id="5970" />
-<TGConnectingPoint num="3" id="5971" />
+<TGConnectingPoint num="0" id="4233" />
+<TGConnectingPoint num="1" id="4234" />
+<TGConnectingPoint num="2" id="4235" />
+<TGConnectingPoint num="3" id="4236" />
 <extraparam>
 <guard value="[ not(b) ]" />
 <afterMin value="" />
@@ -11495,143 +10915,87 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="5981" >
-<cdparam x="529" y="1633" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5980" />
-<P1  x="529" y="1633" id="6669" />
-<P2  x="509" y="1674" id="6588" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5979" >
-<father id="5981" num="0" />
-<cdparam x="532" y="1649" />
-<sizeparam width="24" 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="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5975" />
-<TGConnectingPoint num="1" id="5976" />
-<TGConnectingPoint num="2" id="5977" />
-<TGConnectingPoint num="3" id="5978" />
-<extraparam>
-<guard value="[ b ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5988" >
-<cdparam x="406" y="1723" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5987" />
-<P1  x="484" y="1724" id="6585" />
-<P2  x="415" y="1780" id="6556" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5986" >
-<father id="5988" num="0" />
-<cdparam x="285" y="1756" />
-<sizeparam width="151" 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="1900" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5982" />
-<TGConnectingPoint num="1" id="5983" />
-<TGConnectingPoint num="2" id="5984" />
-<TGConnectingPoint num="3" id="5985" />
-<extraparam>
-<guard value="[ not(tmp1.data == ack) ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="5995" >
-<cdparam x="584" y="1724" />
+<CONNECTOR type="5102" id="4246" >
+<cdparam x="521" y="1565" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="5994" />
-<P1  x="584" y="1724" id="6587" />
-<P2  x="580" y="1781" id="6515" />
+<TGConnectingPoint num="0" id="4245" />
+<P1  x="496" y="1556" id="4847" />
+<P2  x="501" y="1625" id="4758" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="5993" >
-<father id="5995" num="0" />
-<cdparam x="589" y="1756" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4244" >
+<father id="4246" num="0" />
+<cdparam x="508" y="1597" />
+<sizeparam width="195" 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="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5989" />
-<TGConnectingPoint num="1" id="5990" />
-<TGConnectingPoint num="2" id="5991" />
-<TGConnectingPoint num="3" id="5992" />
+<TGConnectingPoint num="0" id="4240" />
+<TGConnectingPoint num="1" id="4241" />
+<TGConnectingPoint num="2" id="4242" />
+<TGConnectingPoint num="3" id="4243" />
 <extraparam>
-<guard value="[ tmp1.data == ack ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sesk = adecrypt(tmp2,idk2sk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6002" >
-<cdparam x="593" y="1831" />
+<CONNECTOR type="5102" id="4253" >
+<cdparam x="549" y="1687" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6001" />
-<P1  x="593" y="1831" id="6504" />
-<P2  x="583" y="1944" id="6441" />
+<TGConnectingPoint num="0" id="4252" />
+<P1  x="532" y="1675" id="4756" />
+<P2  x="533" y="1783" id="4710" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6000" >
-<father id="6002" num="0" />
-<cdparam x="601" y="1856" />
-<sizeparam width="203" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4251" >
+<father id="4253" num="0" />
+<cdparam x="550" y="1707" />
+<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="5996" />
-<TGConnectingPoint num="1" id="5997" />
-<TGConnectingPoint num="2" id="5998" />
-<TGConnectingPoint num="3" id="5999" />
+<TGConnectingPoint num="0" id="4247" />
+<TGConnectingPoint num="1" id="4248" />
+<TGConnectingPoint num="2" id="4249" />
+<TGConnectingPoint num="3" id="4250" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="tmp1.data = secretData" />
-<actions value="tmp2 = sencrypt(secretData, SesK)" />
-<actions value="tmp3.data = ts5" />
-<actions value="tmp4 = concat2(tmp2,tmp3)" />
-<actions value="tmp5 = MAC(tmp4,SesK)" />
-<actions value="m5 = concat2(tmp4,tmp5)" />
+<actions value="tmp1.data = ack" />
+<actions value="tmp2.data = ts4" />
+<actions value="tmp3 = concat2(tmp1,tmp2)" />
+<actions value="tmp4 = sign(tmp3,idk2sk)" />
+<actions value="m4 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6009" >
-<cdparam x="595" y="1994" />
+<CONNECTOR type="5102" id="4260" >
+<cdparam x="520" y="1833" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
-<TGConnectingPoint num="0" id="6008" />
-<P1  x="583" y="1994" id="6446" />
-<P2  x="583" y="2015" id="6429" />
+<TGConnectingPoint num="0" id="4259" />
+<P1  x="520" y="1833" id="4738" />
+<P2  x="519" y="1853" id="4698" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6007" >
-<father id="6009" num="0" />
-<cdparam x="595" y="2034" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4258" >
+<father id="4260" num="0" />
+<cdparam x="520" y="1873" />
 <sizeparam width="10" 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="2400" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="1900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6003" />
-<TGConnectingPoint num="1" id="6004" />
-<TGConnectingPoint num="2" id="6005" />
-<TGConnectingPoint num="3" id="6006" />
+<TGConnectingPoint num="0" id="4254" />
+<TGConnectingPoint num="1" id="4255" />
+<TGConnectingPoint num="2" id="4256" />
+<TGConnectingPoint num="3" id="4257" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11641,25 +11005,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6016" >
-<cdparam x="583" y="2045" />
+<CONNECTOR type="5102" id="4267" >
+<cdparam x="519" y="1883" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6015" />
-<P1  x="583" y="2045" id="6430" />
-<P2  x="580" y="2077" id="6389" />
+<TGConnectingPoint num="0" id="4266" />
+<P1  x="519" y="1883" id="4699" />
+<P2  x="515" y="1911" id="4665" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6014" >
-<father id="6016" num="0" />
-<cdparam x="583" y="2085" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4265" >
+<father id="4267" num="0" />
+<cdparam x="519" y="1923" />
 <sizeparam width="10" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6010" />
-<TGConnectingPoint num="1" id="6011" />
-<TGConnectingPoint num="2" id="6012" />
-<TGConnectingPoint num="3" id="6013" />
+<TGConnectingPoint num="0" id="4261" />
+<TGConnectingPoint num="1" id="4262" />
+<TGConnectingPoint num="2" id="4263" />
+<TGConnectingPoint num="3" id="4264" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11669,25 +11033,25 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6023" >
-<cdparam x="567" y="2127" />
+<CONNECTOR type="5102" id="4274" >
+<cdparam x="527" y="1961" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Receive signal" value="null" />
-<TGConnectingPoint num="0" id="6022" />
-<P1  x="567" y="2127" id="6417" />
-<P2  x="566" y="2151" id="6360" />
+<TGConnectingPoint num="0" id="4273" />
+<P1  x="527" y="1961" id="4686" />
+<P2  x="531" y="1989" id="4629" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6021" >
-<father id="6023" num="0" />
-<cdparam x="567" y="2167" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4272" >
+<father id="4274" num="0" />
+<cdparam x="527" y="2001" />
 <sizeparam width="10" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6017" />
-<TGConnectingPoint num="1" id="6018" />
-<TGConnectingPoint num="2" id="6019" />
-<TGConnectingPoint num="3" id="6020" />
+<TGConnectingPoint num="0" id="4268" />
+<TGConnectingPoint num="1" id="4269" />
+<TGConnectingPoint num="2" id="4270" />
+<TGConnectingPoint num="3" id="4271" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
@@ -11697,57 +11061,57 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6030" >
-<cdparam x="566" y="2181" />
+<CONNECTOR type="5102" id="4281" >
+<cdparam x="531" y="2019" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Receive signal to state0" value="null" />
-<TGConnectingPoint num="0" id="6029" />
-<P1  x="566" y="2181" id="6361" />
-<P2  x="544" y="2227" id="6327" />
+<TGConnectingPoint num="0" id="4280" />
+<P1  x="531" y="2019" id="4630" />
+<P2  x="532" y="2073" id="4589" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6028" >
-<father id="6030" num="0" />
-<cdparam x="569" y="2200" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4279" >
+<father id="4281" num="0" />
+<cdparam x="540" y="2041" />
 <sizeparam width="135" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6024" />
-<TGConnectingPoint num="1" id="6025" />
-<TGConnectingPoint num="2" id="6026" />
-<TGConnectingPoint num="3" id="6027" />
+<TGConnectingPoint num="0" id="4275" />
+<TGConnectingPoint num="1" id="4276" />
+<TGConnectingPoint num="2" id="4277" />
+<TGConnectingPoint num="3" id="4278" />
 <extraparam>
 <guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="get2(m6,tmp3,tmp4)" />
-<actions value="get2(tmp3,tmp1,tmp2)" />
+<actions value="get2(m5,tmp4,tmp5)" />
+<actions value="get2(tmp4,tmp2,tmp3)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6037" >
-<cdparam x="519" y="2277" />
+<CONNECTOR type="5102" id="4288" >
+<cdparam x="494" y="2123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6036" />
-<P1  x="531" y="2277" id="6347" />
-<P2  x="497" y="2323" id="6280" />
+<TGConnectingPoint num="0" id="4287" />
+<P1  x="494" y="2123" id="4616" />
+<P2  x="428" y="2165" id="4565" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6035" >
-<father id="6037" num="0" />
-<cdparam x="358" y="2298" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4286" >
+<father id="4288" num="0" />
+<cdparam x="313" y="2141" />
 <sizeparam width="149" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6031" />
-<TGConnectingPoint num="1" id="6032" />
-<TGConnectingPoint num="2" id="6033" />
-<TGConnectingPoint num="3" id="6034" />
+<TGConnectingPoint num="0" id="4282" />
+<TGConnectingPoint num="1" id="4283" />
+<TGConnectingPoint num="2" id="4284" />
+<TGConnectingPoint num="3" id="4285" />
 <extraparam>
-<guard value="[ not(tmp2.data == ts6) ]" />
+<guard value="[ not(tmp3.data == ts5) ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11755,112 +11119,146 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6044" >
-<cdparam x="619" y="2277" />
+<CONNECTOR type="5102" id="4295" >
+<cdparam x="582" y="2123" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6043" />
-<P1  x="594" y="2277" id="6334" />
-<P2  x="618" y="2321" id="6254" />
+<TGConnectingPoint num="0" id="4294" />
+<P1  x="557" y="2123" id="4603" />
+<P2  x="578" y="2165" id="4523" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6042" >
-<father id="6044" num="0" />
-<cdparam x="616" y="2293" />
-<sizeparam width="188" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4293" >
+<father id="4295" num="0" />
+<cdparam x="590" y="2138" />
+<sizeparam width="187" 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="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6038" />
-<TGConnectingPoint num="1" id="6039" />
-<TGConnectingPoint num="2" id="6040" />
-<TGConnectingPoint num="3" id="6041" />
+<TGConnectingPoint num="0" id="4289" />
+<TGConnectingPoint num="1" id="4290" />
+<TGConnectingPoint num="2" id="4291" />
+<TGConnectingPoint num="3" id="4292" />
 <extraparam>
-<guard value="[ tmp2.data == ts6 ]" />
+<guard value="[ tmp3.data == ts5 ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
-<actions value="b = verifyMAC(tmp3,tmp4,SesK)" />
+<actions value="b = verifyMAC(tmp4,tmp5,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6051" >
-<cdparam x="581" y="2371" />
+<CONNECTOR type="5102" id="4302" >
+<cdparam x="466" y="2215" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6050" />
-<P1  x="593" y="2371" id="6265" />
-<P2  x="540" y="2408" id="6197" />
+<TGConnectingPoint num="0" id="4301" />
+<P1  x="553" y="2215" id="4534" />
+<P2  x="469" y="2265" id="4482" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6049" >
-<father id="6051" num="0" />
-<cdparam x="506" y="2388" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4300" >
+<father id="4302" num="0" />
+<cdparam x="460" y="2238" />
 <sizeparam width="50" 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="2900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6045" />
-<TGConnectingPoint num="1" id="6046" />
-<TGConnectingPoint num="2" id="6047" />
-<TGConnectingPoint num="3" id="6048" />
+<TGConnectingPoint num="0" id="4296" />
+<TGConnectingPoint num="1" id="4297" />
+<TGConnectingPoint num="2" id="4298" />
+<TGConnectingPoint num="3" id="4299" />
+<extraparam>
+<guard value="[ not(b) ]" />
+<afterMin value="" />
+<afterMax value="" />
+<computeMin value="" />
+<computeMax value="" />
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="4309" >
+<cdparam x="641" y="2215" />
+<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector from state0 to state0" value="null" />
+<TGConnectingPoint num="0" id="4308" />
+<P1  x="616" y="2215" id="4521" />
+<P2  x="650" y="2265" id="4432" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4307" >
+<father id="4309" num="0" />
+<cdparam x="638" y="2235" />
+<sizeparam width="151" 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="2400" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="4303" />
+<TGConnectingPoint num="1" id="4304" />
+<TGConnectingPoint num="2" id="4305" />
+<TGConnectingPoint num="3" id="4306" />
 <extraparam>
-<guard value="[ not(b) ]" />
+<guard value="[ b ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="sd = sdecrypt(tmp2,sesk)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6058" >
-<cdparam x="681" y="2371" />
+<CONNECTOR type="5102" id="4316" >
+<cdparam x="695" y="2315" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6057" />
-<P1  x="656" y="2371" id="6252" />
-<P2  x="687" y="2408" id="6172" />
+<TGConnectingPoint num="0" id="4315" />
+<P1  x="681" y="2315" id="4430" />
+<P2  x="670" y="2407" id="4384" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6056" >
-<father id="6058" num="0" />
-<cdparam x="693" y="2391" />
-<sizeparam width="24" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4314" >
+<father id="4316" num="0" />
+<cdparam x="677" y="2337" />
+<sizeparam width="168" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2400" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6052" />
-<TGConnectingPoint num="1" id="6053" />
-<TGConnectingPoint num="2" id="6054" />
-<TGConnectingPoint num="3" id="6055" />
+<TGConnectingPoint num="0" id="4310" />
+<TGConnectingPoint num="1" id="4311" />
+<TGConnectingPoint num="2" id="4312" />
+<TGConnectingPoint num="3" id="4313" />
 <extraparam>
-<guard value="[ b ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
 <computeMax value="" />
+<actions value="tmp1.data = ack" />
+<actions value="tmp2.data = ts6" />
+<actions value="tmp3 = concat2(tmp1,tmp2)" />
+<actions value="tmp4 = MAC(tmp3,sesk)" />
+<actions value="m6 = concat2(tmp3,tmp4)" />
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6065" >
-<cdparam x="650" y="2458" />
+<CONNECTOR type="5102" id="4323" >
+<cdparam x="657" y="2457" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6064" />
-<P1  x="662" y="2458" id="6183" />
-<P2  x="604" y="2519" id="6123" />
+<infoparam name="connector from state0 to Send signal" value="null" />
+<TGConnectingPoint num="0" id="4322" />
+<P1  x="657" y="2457" id="4412" />
+<P2  x="660" y="2480" id="4372" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6063" >
-<father id="6065" num="0" />
-<cdparam x="473" y="2491" />
-<sizeparam width="151" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4321" >
+<father id="4323" num="0" />
+<cdparam x="657" y="2497" />
+<sizeparam width="10" 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="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6059" />
-<TGConnectingPoint num="1" id="6060" />
-<TGConnectingPoint num="2" id="6061" />
-<TGConnectingPoint num="3" id="6062" />
+<TGConnectingPoint num="0" id="4317" />
+<TGConnectingPoint num="1" id="4318" />
+<TGConnectingPoint num="2" id="4319" />
+<TGConnectingPoint num="3" id="4320" />
 <extraparam>
-<guard value="[ not(tmp1.data == ack) ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11868,27 +11266,27 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="6072" >
-<cdparam x="750" y="2458" />
+<CONNECTOR type="5102" id="4330" >
+<cdparam x="660" y="2510" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector from state0 to state0" value="null" />
-<TGConnectingPoint num="0" id="6071" />
-<P1  x="712" y="2458" id="6185" />
-<P2  x="726" y="2522" id="6089" />
+<infoparam name="connector from Send signal to state0" value="null" />
+<TGConnectingPoint num="0" id="4329" />
+<P1  x="660" y="2510" id="4373" />
+<P2  x="642" y="2537" id="4348" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="6070" >
-<father id="6072" num="0" />
-<cdparam x="725" y="2486" />
-<sizeparam width="125" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="4328" >
+<father id="4330" num="0" />
+<cdparam x="660" y="2550" />
+<sizeparam width="10" 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="2900" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="6066" />
-<TGConnectingPoint num="1" id="6067" />
-<TGConnectingPoint num="2" id="6068" />
-<TGConnectingPoint num="3" id="6069" />
+<TGConnectingPoint num="0" id="4324" />
+<TGConnectingPoint num="1" id="4325" />
+<TGConnectingPoint num="2" id="4326" />
+<TGConnectingPoint num="3" id="4327" />
 <extraparam>
-<guard value="[ tmp1.data == ack ]" />
+<guard value="[ ]" />
 <afterMin value="" />
 <afterMax value="" />
 <computeMin value="" />
@@ -11896,1835 +11294,1879 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5106" id="6113" >
-<cdparam x="711" y="2522" />
-<sizeparam width="131" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4371" >
+<cdparam x="595" y="2537" />
+<sizeparam width="128" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
 <infoparam name="state0" value="ProtocolRunEnded" />
-<TGConnectingPoint num="0" id="6073" />
-<TGConnectingPoint num="1" id="6074" />
-<TGConnectingPoint num="2" id="6075" />
-<TGConnectingPoint num="3" id="6076" />
-<TGConnectingPoint num="4" id="6077" />
-<TGConnectingPoint num="5" id="6078" />
-<TGConnectingPoint num="6" id="6079" />
-<TGConnectingPoint num="7" id="6080" />
-<TGConnectingPoint num="8" id="6081" />
-<TGConnectingPoint num="9" id="6082" />
-<TGConnectingPoint num="10" id="6083" />
-<TGConnectingPoint num="11" id="6084" />
-<TGConnectingPoint num="12" id="6085" />
-<TGConnectingPoint num="13" id="6086" />
-<TGConnectingPoint num="14" id="6087" />
-<TGConnectingPoint num="15" id="6088" />
-<TGConnectingPoint num="16" id="6089" />
-<TGConnectingPoint num="17" id="6090" />
-<TGConnectingPoint num="18" id="6091" />
-<TGConnectingPoint num="19" id="6092" />
-<TGConnectingPoint num="20" id="6093" />
-<TGConnectingPoint num="21" id="6094" />
-<TGConnectingPoint num="22" id="6095" />
-<TGConnectingPoint num="23" id="6096" />
-<TGConnectingPoint num="24" id="6097" />
-<TGConnectingPoint num="25" id="6098" />
-<TGConnectingPoint num="26" id="6099" />
-<TGConnectingPoint num="27" id="6100" />
-<TGConnectingPoint num="28" id="6101" />
-<TGConnectingPoint num="29" id="6102" />
-<TGConnectingPoint num="30" id="6103" />
-<TGConnectingPoint num="31" id="6104" />
-<TGConnectingPoint num="32" id="6105" />
-<TGConnectingPoint num="33" id="6106" />
-<TGConnectingPoint num="34" id="6107" />
-<TGConnectingPoint num="35" id="6108" />
-<TGConnectingPoint num="36" id="6109" />
-<TGConnectingPoint num="37" id="6110" />
-<TGConnectingPoint num="38" id="6111" />
-<TGConnectingPoint num="39" id="6112" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="6154" >
-<cdparam x="514" y="2519" />
-<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="UnexpectedMsg6" />
-<TGConnectingPoint num="0" id="6114" />
-<TGConnectingPoint num="1" id="6115" />
-<TGConnectingPoint num="2" id="6116" />
-<TGConnectingPoint num="3" id="6117" />
-<TGConnectingPoint num="4" id="6118" />
-<TGConnectingPoint num="5" id="6119" />
-<TGConnectingPoint num="6" id="6120" />
-<TGConnectingPoint num="7" id="6121" />
-<TGConnectingPoint num="8" id="6122" />
-<TGConnectingPoint num="9" id="6123" />
-<TGConnectingPoint num="10" id="6124" />
-<TGConnectingPoint num="11" id="6125" />
-<TGConnectingPoint num="12" id="6126" />
-<TGConnectingPoint num="13" id="6127" />
-<TGConnectingPoint num="14" id="6128" />
-<TGConnectingPoint num="15" id="6129" />
-<TGConnectingPoint num="16" id="6130" />
-<TGConnectingPoint num="17" id="6131" />
-<TGConnectingPoint num="18" id="6132" />
-<TGConnectingPoint num="19" id="6133" />
-<TGConnectingPoint num="20" id="6134" />
-<TGConnectingPoint num="21" id="6135" />
-<TGConnectingPoint num="22" id="6136" />
-<TGConnectingPoint num="23" id="6137" />
-<TGConnectingPoint num="24" id="6138" />
-<TGConnectingPoint num="25" id="6139" />
-<TGConnectingPoint num="26" id="6140" />
-<TGConnectingPoint num="27" id="6141" />
-<TGConnectingPoint num="28" id="6142" />
-<TGConnectingPoint num="29" id="6143" />
-<TGConnectingPoint num="30" id="6144" />
-<TGConnectingPoint num="31" id="6145" />
-<TGConnectingPoint num="32" id="6146" />
-<TGConnectingPoint num="33" id="6147" />
-<TGConnectingPoint num="34" id="6148" />
-<TGConnectingPoint num="35" id="6149" />
-<TGConnectingPoint num="36" id="6150" />
-<TGConnectingPoint num="37" id="6151" />
-<TGConnectingPoint num="38" id="6152" />
-<TGConnectingPoint num="39" id="6153" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="6195" >
-<cdparam x="650" y="2408" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyack6" />
-<TGConnectingPoint num="0" id="6155" />
-<TGConnectingPoint num="1" id="6156" />
-<TGConnectingPoint num="2" id="6157" />
-<TGConnectingPoint num="3" id="6158" />
-<TGConnectingPoint num="4" id="6159" />
-<TGConnectingPoint num="5" id="6160" />
-<TGConnectingPoint num="6" id="6161" />
-<TGConnectingPoint num="7" id="6162" />
-<TGConnectingPoint num="8" id="6163" />
-<TGConnectingPoint num="9" id="6164" />
-<TGConnectingPoint num="10" id="6165" />
-<TGConnectingPoint num="11" id="6166" />
-<TGConnectingPoint num="12" id="6167" />
-<TGConnectingPoint num="13" id="6168" />
-<TGConnectingPoint num="14" id="6169" />
-<TGConnectingPoint num="15" id="6170" />
-<TGConnectingPoint num="16" id="6171" />
-<TGConnectingPoint num="17" id="6172" />
-<TGConnectingPoint num="18" id="6173" />
-<TGConnectingPoint num="19" id="6174" />
-<TGConnectingPoint num="20" id="6175" />
-<TGConnectingPoint num="21" id="6176" />
-<TGConnectingPoint num="22" id="6177" />
-<TGConnectingPoint num="23" id="6178" />
-<TGConnectingPoint num="24" id="6179" />
-<TGConnectingPoint num="25" id="6180" />
-<TGConnectingPoint num="26" id="6181" />
-<TGConnectingPoint num="27" id="6182" />
-<TGConnectingPoint num="28" id="6183" />
-<TGConnectingPoint num="29" id="6184" />
-<TGConnectingPoint num="30" id="6185" />
-<TGConnectingPoint num="31" id="6186" />
-<TGConnectingPoint num="32" id="6187" />
-<TGConnectingPoint num="33" id="6188" />
-<TGConnectingPoint num="34" id="6189" />
-<TGConnectingPoint num="35" id="6190" />
-<TGConnectingPoint num="36" id="6191" />
-<TGConnectingPoint num="37" id="6192" />
-<TGConnectingPoint num="38" id="6193" />
-<TGConnectingPoint num="39" id="6194" />
+<TGConnectingPoint num="0" id="4331" />
+<TGConnectingPoint num="1" id="4332" />
+<TGConnectingPoint num="2" id="4333" />
+<TGConnectingPoint num="3" id="4334" />
+<TGConnectingPoint num="4" id="4335" />
+<TGConnectingPoint num="5" id="4336" />
+<TGConnectingPoint num="6" id="4337" />
+<TGConnectingPoint num="7" id="4338" />
+<TGConnectingPoint num="8" id="4339" />
+<TGConnectingPoint num="9" id="4340" />
+<TGConnectingPoint num="10" id="4341" />
+<TGConnectingPoint num="11" id="4342" />
+<TGConnectingPoint num="12" id="4343" />
+<TGConnectingPoint num="13" id="4344" />
+<TGConnectingPoint num="14" id="4345" />
+<TGConnectingPoint num="15" id="4346" />
+<TGConnectingPoint num="16" id="4347" />
+<TGConnectingPoint num="17" id="4348" />
+<TGConnectingPoint num="18" id="4349" />
+<TGConnectingPoint num="19" id="4350" />
+<TGConnectingPoint num="20" id="4351" />
+<TGConnectingPoint num="21" id="4352" />
+<TGConnectingPoint num="22" id="4353" />
+<TGConnectingPoint num="23" id="4354" />
+<TGConnectingPoint num="24" id="4355" />
+<TGConnectingPoint num="25" id="4356" />
+<TGConnectingPoint num="26" id="4357" />
+<TGConnectingPoint num="27" id="4358" />
+<TGConnectingPoint num="28" id="4359" />
+<TGConnectingPoint num="29" id="4360" />
+<TGConnectingPoint num="30" id="4361" />
+<TGConnectingPoint num="31" id="4362" />
+<TGConnectingPoint num="32" id="4363" />
+<TGConnectingPoint num="33" id="4364" />
+<TGConnectingPoint num="34" id="4365" />
+<TGConnectingPoint num="35" id="4366" />
+<TGConnectingPoint num="36" id="4367" />
+<TGConnectingPoint num="37" id="4368" />
+<TGConnectingPoint num="38" id="4369" />
+<TGConnectingPoint num="39" id="4370" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6236" >
-<cdparam x="490" y="2408" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="4382" >
+<cdparam x="626" y="2485" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state0" value="InvalidMAC6" />
-<TGConnectingPoint num="0" id="6196" />
-<TGConnectingPoint num="1" id="6197" />
-<TGConnectingPoint num="2" id="6198" />
-<TGConnectingPoint num="3" id="6199" />
-<TGConnectingPoint num="4" id="6200" />
-<TGConnectingPoint num="5" id="6201" />
-<TGConnectingPoint num="6" id="6202" />
-<TGConnectingPoint num="7" id="6203" />
-<TGConnectingPoint num="8" id="6204" />
-<TGConnectingPoint num="9" id="6205" />
-<TGConnectingPoint num="10" id="6206" />
-<TGConnectingPoint num="11" id="6207" />
-<TGConnectingPoint num="12" id="6208" />
-<TGConnectingPoint num="13" id="6209" />
-<TGConnectingPoint num="14" id="6210" />
-<TGConnectingPoint num="15" id="6211" />
-<TGConnectingPoint num="16" id="6212" />
-<TGConnectingPoint num="17" id="6213" />
-<TGConnectingPoint num="18" id="6214" />
-<TGConnectingPoint num="19" id="6215" />
-<TGConnectingPoint num="20" id="6216" />
-<TGConnectingPoint num="21" id="6217" />
-<TGConnectingPoint num="22" id="6218" />
-<TGConnectingPoint num="23" id="6219" />
-<TGConnectingPoint num="24" id="6220" />
-<TGConnectingPoint num="25" id="6221" />
-<TGConnectingPoint num="26" id="6222" />
-<TGConnectingPoint num="27" id="6223" />
-<TGConnectingPoint num="28" id="6224" />
-<TGConnectingPoint num="29" id="6225" />
-<TGConnectingPoint num="30" id="6226" />
-<TGConnectingPoint num="31" id="6227" />
-<TGConnectingPoint num="32" id="6228" />
-<TGConnectingPoint num="33" id="6229" />
-<TGConnectingPoint num="34" id="6230" />
-<TGConnectingPoint num="35" id="6231" />
-<TGConnectingPoint num="36" id="6232" />
-<TGConnectingPoint num="37" id="6233" />
-<TGConnectingPoint num="38" id="6234" />
-<TGConnectingPoint num="39" id="6235" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(m6)" />
+<TGConnectingPoint num="0" id="4372" />
+<TGConnectingPoint num="1" id="4373" />
+<TGConnectingPoint num="2" id="4374" />
+<TGConnectingPoint num="3" id="4375" />
+<TGConnectingPoint num="4" id="4376" />
+<TGConnectingPoint num="5" id="4377" />
+<TGConnectingPoint num="6" id="4378" />
+<TGConnectingPoint num="7" id="4379" />
+<TGConnectingPoint num="8" id="4380" />
+<TGConnectingPoint num="9" id="4381" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="6277" >
-<cdparam x="581" y="2321" />
+<COMPONENT type="5106" id="4423" >
+<cdparam x="620" y="2407" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyMAC6" />
-<TGConnectingPoint num="0" id="6237" />
-<TGConnectingPoint num="1" id="6238" />
-<TGConnectingPoint num="2" id="6239" />
-<TGConnectingPoint num="3" id="6240" />
-<TGConnectingPoint num="4" id="6241" />
-<TGConnectingPoint num="5" id="6242" />
-<TGConnectingPoint num="6" id="6243" />
-<TGConnectingPoint num="7" id="6244" />
-<TGConnectingPoint num="8" id="6245" />
-<TGConnectingPoint num="9" id="6246" />
-<TGConnectingPoint num="10" id="6247" />
-<TGConnectingPoint num="11" id="6248" />
-<TGConnectingPoint num="12" id="6249" />
-<TGConnectingPoint num="13" id="6250" />
-<TGConnectingPoint num="14" id="6251" />
-<TGConnectingPoint num="15" id="6252" />
-<TGConnectingPoint num="16" id="6253" />
-<TGConnectingPoint num="17" id="6254" />
-<TGConnectingPoint num="18" id="6255" />
-<TGConnectingPoint num="19" id="6256" />
-<TGConnectingPoint num="20" id="6257" />
-<TGConnectingPoint num="21" id="6258" />
-<TGConnectingPoint num="22" id="6259" />
-<TGConnectingPoint num="23" id="6260" />
-<TGConnectingPoint num="24" id="6261" />
-<TGConnectingPoint num="25" id="6262" />
-<TGConnectingPoint num="26" id="6263" />
-<TGConnectingPoint num="27" id="6264" />
-<TGConnectingPoint num="28" id="6265" />
-<TGConnectingPoint num="29" id="6266" />
-<TGConnectingPoint num="30" id="6267" />
-<TGConnectingPoint num="31" id="6268" />
-<TGConnectingPoint num="32" id="6269" />
-<TGConnectingPoint num="33" id="6270" />
-<TGConnectingPoint num="34" id="6271" />
-<TGConnectingPoint num="35" id="6272" />
-<TGConnectingPoint num="36" id="6273" />
-<TGConnectingPoint num="37" id="6274" />
-<TGConnectingPoint num="38" id="6275" />
-<TGConnectingPoint num="39" id="6276" />
+<infoparam name="state0" value="SendMsg6" />
+<TGConnectingPoint num="0" id="4383" />
+<TGConnectingPoint num="1" id="4384" />
+<TGConnectingPoint num="2" id="4385" />
+<TGConnectingPoint num="3" id="4386" />
+<TGConnectingPoint num="4" id="4387" />
+<TGConnectingPoint num="5" id="4388" />
+<TGConnectingPoint num="6" id="4389" />
+<TGConnectingPoint num="7" id="4390" />
+<TGConnectingPoint num="8" id="4391" />
+<TGConnectingPoint num="9" id="4392" />
+<TGConnectingPoint num="10" id="4393" />
+<TGConnectingPoint num="11" id="4394" />
+<TGConnectingPoint num="12" id="4395" />
+<TGConnectingPoint num="13" id="4396" />
+<TGConnectingPoint num="14" id="4397" />
+<TGConnectingPoint num="15" id="4398" />
+<TGConnectingPoint num="16" id="4399" />
+<TGConnectingPoint num="17" id="4400" />
+<TGConnectingPoint num="18" id="4401" />
+<TGConnectingPoint num="19" id="4402" />
+<TGConnectingPoint num="20" id="4403" />
+<TGConnectingPoint num="21" id="4404" />
+<TGConnectingPoint num="22" id="4405" />
+<TGConnectingPoint num="23" id="4406" />
+<TGConnectingPoint num="24" id="4407" />
+<TGConnectingPoint num="25" id="4408" />
+<TGConnectingPoint num="26" id="4409" />
+<TGConnectingPoint num="27" id="4410" />
+<TGConnectingPoint num="28" id="4411" />
+<TGConnectingPoint num="29" id="4412" />
+<TGConnectingPoint num="30" id="4413" />
+<TGConnectingPoint num="31" id="4414" />
+<TGConnectingPoint num="32" id="4415" />
+<TGConnectingPoint num="33" id="4416" />
+<TGConnectingPoint num="34" id="4417" />
+<TGConnectingPoint num="35" id="4418" />
+<TGConnectingPoint num="36" id="4419" />
+<TGConnectingPoint num="37" id="4420" />
+<TGConnectingPoint num="38" id="4421" />
+<TGConnectingPoint num="39" id="4422" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6318" >
-<cdparam x="397" y="2323" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4464" >
+<cdparam x="620" y="2265" />
+<sizeparam width="123" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidt6" />
-<TGConnectingPoint num="0" id="6278" />
-<TGConnectingPoint num="1" id="6279" />
-<TGConnectingPoint num="2" id="6280" />
-<TGConnectingPoint num="3" id="6281" />
-<TGConnectingPoint num="4" id="6282" />
-<TGConnectingPoint num="5" id="6283" />
-<TGConnectingPoint num="6" id="6284" />
-<TGConnectingPoint num="7" id="6285" />
-<TGConnectingPoint num="8" id="6286" />
-<TGConnectingPoint num="9" id="6287" />
-<TGConnectingPoint num="10" id="6288" />
-<TGConnectingPoint num="11" id="6289" />
-<TGConnectingPoint num="12" id="6290" />
-<TGConnectingPoint num="13" id="6291" />
-<TGConnectingPoint num="14" id="6292" />
-<TGConnectingPoint num="15" id="6293" />
-<TGConnectingPoint num="16" id="6294" />
-<TGConnectingPoint num="17" id="6295" />
-<TGConnectingPoint num="18" id="6296" />
-<TGConnectingPoint num="19" id="6297" />
-<TGConnectingPoint num="20" id="6298" />
-<TGConnectingPoint num="21" id="6299" />
-<TGConnectingPoint num="22" id="6300" />
-<TGConnectingPoint num="23" id="6301" />
-<TGConnectingPoint num="24" id="6302" />
-<TGConnectingPoint num="25" id="6303" />
-<TGConnectingPoint num="26" id="6304" />
-<TGConnectingPoint num="27" id="6305" />
-<TGConnectingPoint num="28" id="6306" />
-<TGConnectingPoint num="29" id="6307" />
-<TGConnectingPoint num="30" id="6308" />
-<TGConnectingPoint num="31" id="6309" />
-<TGConnectingPoint num="32" id="6310" />
-<TGConnectingPoint num="33" id="6311" />
-<TGConnectingPoint num="34" id="6312" />
-<TGConnectingPoint num="35" id="6313" />
-<TGConnectingPoint num="36" id="6314" />
-<TGConnectingPoint num="37" id="6315" />
-<TGConnectingPoint num="38" id="6316" />
-<TGConnectingPoint num="39" id="6317" />
+<infoparam name="state0" value="SecretDataReceived" />
+<TGConnectingPoint num="0" id="4424" />
+<TGConnectingPoint num="1" id="4425" />
+<TGConnectingPoint num="2" id="4426" />
+<TGConnectingPoint num="3" id="4427" />
+<TGConnectingPoint num="4" id="4428" />
+<TGConnectingPoint num="5" id="4429" />
+<TGConnectingPoint num="6" id="4430" />
+<TGConnectingPoint num="7" id="4431" />
+<TGConnectingPoint num="8" id="4432" />
+<TGConnectingPoint num="9" id="4433" />
+<TGConnectingPoint num="10" id="4434" />
+<TGConnectingPoint num="11" id="4435" />
+<TGConnectingPoint num="12" id="4436" />
+<TGConnectingPoint num="13" id="4437" />
+<TGConnectingPoint num="14" id="4438" />
+<TGConnectingPoint num="15" id="4439" />
+<TGConnectingPoint num="16" id="4440" />
+<TGConnectingPoint num="17" id="4441" />
+<TGConnectingPoint num="18" id="4442" />
+<TGConnectingPoint num="19" id="4443" />
+<TGConnectingPoint num="20" id="4444" />
+<TGConnectingPoint num="21" id="4445" />
+<TGConnectingPoint num="22" id="4446" />
+<TGConnectingPoint num="23" id="4447" />
+<TGConnectingPoint num="24" id="4448" />
+<TGConnectingPoint num="25" id="4449" />
+<TGConnectingPoint num="26" id="4450" />
+<TGConnectingPoint num="27" id="4451" />
+<TGConnectingPoint num="28" id="4452" />
+<TGConnectingPoint num="29" id="4453" />
+<TGConnectingPoint num="30" id="4454" />
+<TGConnectingPoint num="31" id="4455" />
+<TGConnectingPoint num="32" id="4456" />
+<TGConnectingPoint num="33" id="4457" />
+<TGConnectingPoint num="34" id="4458" />
+<TGConnectingPoint num="35" id="4459" />
+<TGConnectingPoint num="36" id="4460" />
+<TGConnectingPoint num="37" id="4461" />
+<TGConnectingPoint num="38" id="4462" />
+<TGConnectingPoint num="39" id="4463" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6359" >
-<cdparam x="519" y="2227" />
+<COMPONENT type="5106" id="4505" >
+<cdparam x="432" y="2265" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testt6" />
-<TGConnectingPoint num="0" id="6319" />
-<TGConnectingPoint num="1" id="6320" />
-<TGConnectingPoint num="2" id="6321" />
-<TGConnectingPoint num="3" id="6322" />
-<TGConnectingPoint num="4" id="6323" />
-<TGConnectingPoint num="5" id="6324" />
-<TGConnectingPoint num="6" id="6325" />
-<TGConnectingPoint num="7" id="6326" />
-<TGConnectingPoint num="8" id="6327" />
-<TGConnectingPoint num="9" id="6328" />
-<TGConnectingPoint num="10" id="6329" />
-<TGConnectingPoint num="11" id="6330" />
-<TGConnectingPoint num="12" id="6331" />
-<TGConnectingPoint num="13" id="6332" />
-<TGConnectingPoint num="14" id="6333" />
-<TGConnectingPoint num="15" id="6334" />
-<TGConnectingPoint num="16" id="6335" />
-<TGConnectingPoint num="17" id="6336" />
-<TGConnectingPoint num="18" id="6337" />
-<TGConnectingPoint num="19" id="6338" />
-<TGConnectingPoint num="20" id="6339" />
-<TGConnectingPoint num="21" id="6340" />
-<TGConnectingPoint num="22" id="6341" />
-<TGConnectingPoint num="23" id="6342" />
-<TGConnectingPoint num="24" id="6343" />
-<TGConnectingPoint num="25" id="6344" />
-<TGConnectingPoint num="26" id="6345" />
-<TGConnectingPoint num="27" id="6346" />
-<TGConnectingPoint num="28" id="6347" />
-<TGConnectingPoint num="29" id="6348" />
-<TGConnectingPoint num="30" id="6349" />
-<TGConnectingPoint num="31" id="6350" />
-<TGConnectingPoint num="32" id="6351" />
-<TGConnectingPoint num="33" id="6352" />
-<TGConnectingPoint num="34" id="6353" />
-<TGConnectingPoint num="35" id="6354" />
-<TGConnectingPoint num="36" id="6355" />
-<TGConnectingPoint num="37" id="6356" />
-<TGConnectingPoint num="38" id="6357" />
-<TGConnectingPoint num="39" id="6358" />
+<infoparam name="state0" value="InvalidMAC5" />
+<TGConnectingPoint num="0" id="4465" />
+<TGConnectingPoint num="1" id="4466" />
+<TGConnectingPoint num="2" id="4467" />
+<TGConnectingPoint num="3" id="4468" />
+<TGConnectingPoint num="4" id="4469" />
+<TGConnectingPoint num="5" id="4470" />
+<TGConnectingPoint num="6" id="4471" />
+<TGConnectingPoint num="7" id="4472" />
+<TGConnectingPoint num="8" id="4473" />
+<TGConnectingPoint num="9" id="4474" />
+<TGConnectingPoint num="10" id="4475" />
+<TGConnectingPoint num="11" id="4476" />
+<TGConnectingPoint num="12" id="4477" />
+<TGConnectingPoint num="13" id="4478" />
+<TGConnectingPoint num="14" id="4479" />
+<TGConnectingPoint num="15" id="4480" />
+<TGConnectingPoint num="16" id="4481" />
+<TGConnectingPoint num="17" id="4482" />
+<TGConnectingPoint num="18" id="4483" />
+<TGConnectingPoint num="19" id="4484" />
+<TGConnectingPoint num="20" id="4485" />
+<TGConnectingPoint num="21" id="4486" />
+<TGConnectingPoint num="22" id="4487" />
+<TGConnectingPoint num="23" id="4488" />
+<TGConnectingPoint num="24" id="4489" />
+<TGConnectingPoint num="25" id="4490" />
+<TGConnectingPoint num="26" id="4491" />
+<TGConnectingPoint num="27" id="4492" />
+<TGConnectingPoint num="28" id="4493" />
+<TGConnectingPoint num="29" id="4494" />
+<TGConnectingPoint num="30" id="4495" />
+<TGConnectingPoint num="31" id="4496" />
+<TGConnectingPoint num="32" id="4497" />
+<TGConnectingPoint num="33" id="4498" />
+<TGConnectingPoint num="34" id="4499" />
+<TGConnectingPoint num="35" id="4500" />
+<TGConnectingPoint num="36" id="4501" />
+<TGConnectingPoint num="37" id="4502" />
+<TGConnectingPoint num="38" id="4503" />
+<TGConnectingPoint num="39" id="4504" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="6370" >
-<cdparam x="532" y="2156" />
-<sizeparam width="68" 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="2900" />
-<infoparam name="Receive signal" value="chin(m6)" />
-<TGConnectingPoint num="0" id="6360" />
-<TGConnectingPoint num="1" id="6361" />
-<TGConnectingPoint num="2" id="6362" />
-<TGConnectingPoint num="3" id="6363" />
-<TGConnectingPoint num="4" id="6364" />
-<TGConnectingPoint num="5" id="6365" />
-<TGConnectingPoint num="6" id="6366" />
-<TGConnectingPoint num="7" id="6367" />
-<TGConnectingPoint num="8" id="6368" />
-<TGConnectingPoint num="9" id="6369" />
-</COMPONENT>
-
-<COMPONENT type="301" id="6387" >
-<cdparam x="741" y="2073" />
-<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4546" >
+<cdparam x="541" y="2165" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify ack message from ECU2
-" />
-<TGConnectingPoint num="0" id="6371" />
-<TGConnectingPoint num="1" id="6372" />
-<TGConnectingPoint num="2" id="6373" />
-<TGConnectingPoint num="3" id="6374" />
-<TGConnectingPoint num="4" id="6375" />
-<TGConnectingPoint num="5" id="6376" />
-<TGConnectingPoint num="6" id="6377" />
-<TGConnectingPoint num="7" id="6378" />
-<TGConnectingPoint num="8" id="6379" />
-<TGConnectingPoint num="9" id="6380" />
-<TGConnectingPoint num="10" id="6381" />
-<TGConnectingPoint num="11" id="6382" />
-<TGConnectingPoint num="12" id="6383" />
-<TGConnectingPoint num="13" id="6384" />
-<TGConnectingPoint num="14" id="6385" />
-<TGConnectingPoint num="15" id="6386" />
+<infoparam name="state0" value="VerifyMAC5" />
+<TGConnectingPoint num="0" id="4506" />
+<TGConnectingPoint num="1" id="4507" />
+<TGConnectingPoint num="2" id="4508" />
+<TGConnectingPoint num="3" id="4509" />
+<TGConnectingPoint num="4" id="4510" />
+<TGConnectingPoint num="5" id="4511" />
+<TGConnectingPoint num="6" id="4512" />
+<TGConnectingPoint num="7" id="4513" />
+<TGConnectingPoint num="8" id="4514" />
+<TGConnectingPoint num="9" id="4515" />
+<TGConnectingPoint num="10" id="4516" />
+<TGConnectingPoint num="11" id="4517" />
+<TGConnectingPoint num="12" id="4518" />
+<TGConnectingPoint num="13" id="4519" />
+<TGConnectingPoint num="14" id="4520" />
+<TGConnectingPoint num="15" id="4521" />
+<TGConnectingPoint num="16" id="4522" />
+<TGConnectingPoint num="17" id="4523" />
+<TGConnectingPoint num="18" id="4524" />
+<TGConnectingPoint num="19" id="4525" />
+<TGConnectingPoint num="20" id="4526" />
+<TGConnectingPoint num="21" id="4527" />
+<TGConnectingPoint num="22" id="4528" />
+<TGConnectingPoint num="23" id="4529" />
+<TGConnectingPoint num="24" id="4530" />
+<TGConnectingPoint num="25" id="4531" />
+<TGConnectingPoint num="26" id="4532" />
+<TGConnectingPoint num="27" id="4533" />
+<TGConnectingPoint num="28" id="4534" />
+<TGConnectingPoint num="29" id="4535" />
+<TGConnectingPoint num="30" id="4536" />
+<TGConnectingPoint num="31" id="4537" />
+<TGConnectingPoint num="32" id="4538" />
+<TGConnectingPoint num="33" id="4539" />
+<TGConnectingPoint num="34" id="4540" />
+<TGConnectingPoint num="35" id="4541" />
+<TGConnectingPoint num="36" id="4542" />
+<TGConnectingPoint num="37" id="4543" />
+<TGConnectingPoint num="38" id="4544" />
+<TGConnectingPoint num="39" id="4545" />
 <extraparam>
-<Line value="Receive and verify ack message from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6428" >
-<cdparam x="530" y="2077" />
+<COMPONENT type="5106" id="4587" >
+<cdparam x="366" y="2165" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg6" />
-<TGConnectingPoint num="0" id="6388" />
-<TGConnectingPoint num="1" id="6389" />
-<TGConnectingPoint num="2" id="6390" />
-<TGConnectingPoint num="3" id="6391" />
-<TGConnectingPoint num="4" id="6392" />
-<TGConnectingPoint num="5" id="6393" />
-<TGConnectingPoint num="6" id="6394" />
-<TGConnectingPoint num="7" id="6395" />
-<TGConnectingPoint num="8" id="6396" />
-<TGConnectingPoint num="9" id="6397" />
-<TGConnectingPoint num="10" id="6398" />
-<TGConnectingPoint num="11" id="6399" />
-<TGConnectingPoint num="12" id="6400" />
-<TGConnectingPoint num="13" id="6401" />
-<TGConnectingPoint num="14" id="6402" />
-<TGConnectingPoint num="15" id="6403" />
-<TGConnectingPoint num="16" id="6404" />
-<TGConnectingPoint num="17" id="6405" />
-<TGConnectingPoint num="18" id="6406" />
-<TGConnectingPoint num="19" id="6407" />
-<TGConnectingPoint num="20" id="6408" />
-<TGConnectingPoint num="21" id="6409" />
-<TGConnectingPoint num="22" id="6410" />
-<TGConnectingPoint num="23" id="6411" />
-<TGConnectingPoint num="24" id="6412" />
-<TGConnectingPoint num="25" id="6413" />
-<TGConnectingPoint num="26" id="6414" />
-<TGConnectingPoint num="27" id="6415" />
-<TGConnectingPoint num="28" id="6416" />
-<TGConnectingPoint num="29" id="6417" />
-<TGConnectingPoint num="30" id="6418" />
-<TGConnectingPoint num="31" id="6419" />
-<TGConnectingPoint num="32" id="6420" />
-<TGConnectingPoint num="33" id="6421" />
-<TGConnectingPoint num="34" id="6422" />
-<TGConnectingPoint num="35" id="6423" />
-<TGConnectingPoint num="36" id="6424" />
-<TGConnectingPoint num="37" id="6425" />
-<TGConnectingPoint num="38" id="6426" />
-<TGConnectingPoint num="39" id="6427" />
+<infoparam name="state0" value="Invalidts5" />
+<TGConnectingPoint num="0" id="4547" />
+<TGConnectingPoint num="1" id="4548" />
+<TGConnectingPoint num="2" id="4549" />
+<TGConnectingPoint num="3" id="4550" />
+<TGConnectingPoint num="4" id="4551" />
+<TGConnectingPoint num="5" id="4552" />
+<TGConnectingPoint num="6" id="4553" />
+<TGConnectingPoint num="7" id="4554" />
+<TGConnectingPoint num="8" id="4555" />
+<TGConnectingPoint num="9" id="4556" />
+<TGConnectingPoint num="10" id="4557" />
+<TGConnectingPoint num="11" id="4558" />
+<TGConnectingPoint num="12" id="4559" />
+<TGConnectingPoint num="13" id="4560" />
+<TGConnectingPoint num="14" id="4561" />
+<TGConnectingPoint num="15" id="4562" />
+<TGConnectingPoint num="16" id="4563" />
+<TGConnectingPoint num="17" id="4564" />
+<TGConnectingPoint num="18" id="4565" />
+<TGConnectingPoint num="19" id="4566" />
+<TGConnectingPoint num="20" id="4567" />
+<TGConnectingPoint num="21" id="4568" />
+<TGConnectingPoint num="22" id="4569" />
+<TGConnectingPoint num="23" id="4570" />
+<TGConnectingPoint num="24" id="4571" />
+<TGConnectingPoint num="25" id="4572" />
+<TGConnectingPoint num="26" id="4573" />
+<TGConnectingPoint num="27" id="4574" />
+<TGConnectingPoint num="28" id="4575" />
+<TGConnectingPoint num="29" id="4576" />
+<TGConnectingPoint num="30" id="4577" />
+<TGConnectingPoint num="31" id="4578" />
+<TGConnectingPoint num="32" id="4579" />
+<TGConnectingPoint num="33" id="4580" />
+<TGConnectingPoint num="34" id="4581" />
+<TGConnectingPoint num="35" id="4582" />
+<TGConnectingPoint num="36" id="4583" />
+<TGConnectingPoint num="37" id="4584" />
+<TGConnectingPoint num="38" id="4585" />
+<TGConnectingPoint num="39" id="4586" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="6439" >
-<cdparam x="549" y="2020" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4628" >
+<cdparam x="482" y="2073" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m5)" />
-<TGConnectingPoint num="0" id="6429" />
-<TGConnectingPoint num="1" id="6430" />
-<TGConnectingPoint num="2" id="6431" />
-<TGConnectingPoint num="3" id="6432" />
-<TGConnectingPoint num="4" id="6433" />
-<TGConnectingPoint num="5" id="6434" />
-<TGConnectingPoint num="6" id="6435" />
-<TGConnectingPoint num="7" id="6436" />
-<TGConnectingPoint num="8" id="6437" />
-<TGConnectingPoint num="9" id="6438" />
+<infoparam name="state0" value="Testts5" />
+<TGConnectingPoint num="0" id="4588" />
+<TGConnectingPoint num="1" id="4589" />
+<TGConnectingPoint num="2" id="4590" />
+<TGConnectingPoint num="3" id="4591" />
+<TGConnectingPoint num="4" id="4592" />
+<TGConnectingPoint num="5" id="4593" />
+<TGConnectingPoint num="6" id="4594" />
+<TGConnectingPoint num="7" id="4595" />
+<TGConnectingPoint num="8" id="4596" />
+<TGConnectingPoint num="9" id="4597" />
+<TGConnectingPoint num="10" id="4598" />
+<TGConnectingPoint num="11" id="4599" />
+<TGConnectingPoint num="12" id="4600" />
+<TGConnectingPoint num="13" id="4601" />
+<TGConnectingPoint num="14" id="4602" />
+<TGConnectingPoint num="15" id="4603" />
+<TGConnectingPoint num="16" id="4604" />
+<TGConnectingPoint num="17" id="4605" />
+<TGConnectingPoint num="18" id="4606" />
+<TGConnectingPoint num="19" id="4607" />
+<TGConnectingPoint num="20" id="4608" />
+<TGConnectingPoint num="21" id="4609" />
+<TGConnectingPoint num="22" id="4610" />
+<TGConnectingPoint num="23" id="4611" />
+<TGConnectingPoint num="24" id="4612" />
+<TGConnectingPoint num="25" id="4613" />
+<TGConnectingPoint num="26" id="4614" />
+<TGConnectingPoint num="27" id="4615" />
+<TGConnectingPoint num="28" id="4616" />
+<TGConnectingPoint num="29" id="4617" />
+<TGConnectingPoint num="30" id="4618" />
+<TGConnectingPoint num="31" id="4619" />
+<TGConnectingPoint num="32" id="4620" />
+<TGConnectingPoint num="33" id="4621" />
+<TGConnectingPoint num="34" id="4622" />
+<TGConnectingPoint num="35" id="4623" />
+<TGConnectingPoint num="36" id="4624" />
+<TGConnectingPoint num="37" id="4625" />
+<TGConnectingPoint num="38" id="4626" />
+<TGConnectingPoint num="39" id="4627" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6480" >
-<cdparam x="533" y="1944" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="4639" >
+<cdparam x="497" y="1994" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state0" value="SendMsg5" />
-<TGConnectingPoint num="0" id="6440" />
-<TGConnectingPoint num="1" id="6441" />
-<TGConnectingPoint num="2" id="6442" />
-<TGConnectingPoint num="3" id="6443" />
-<TGConnectingPoint num="4" id="6444" />
-<TGConnectingPoint num="5" id="6445" />
-<TGConnectingPoint num="6" id="6446" />
-<TGConnectingPoint num="7" id="6447" />
-<TGConnectingPoint num="8" id="6448" />
-<TGConnectingPoint num="9" id="6449" />
-<TGConnectingPoint num="10" id="6450" />
-<TGConnectingPoint num="11" id="6451" />
-<TGConnectingPoint num="12" id="6452" />
-<TGConnectingPoint num="13" id="6453" />
-<TGConnectingPoint num="14" id="6454" />
-<TGConnectingPoint num="15" id="6455" />
-<TGConnectingPoint num="16" id="6456" />
-<TGConnectingPoint num="17" id="6457" />
-<TGConnectingPoint num="18" id="6458" />
-<TGConnectingPoint num="19" id="6459" />
-<TGConnectingPoint num="20" id="6460" />
-<TGConnectingPoint num="21" id="6461" />
-<TGConnectingPoint num="22" id="6462" />
-<TGConnectingPoint num="23" id="6463" />
-<TGConnectingPoint num="24" id="6464" />
-<TGConnectingPoint num="25" id="6465" />
-<TGConnectingPoint num="26" id="6466" />
-<TGConnectingPoint num="27" id="6467" />
-<TGConnectingPoint num="28" id="6468" />
-<TGConnectingPoint num="29" id="6469" />
-<TGConnectingPoint num="30" id="6470" />
-<TGConnectingPoint num="31" id="6471" />
-<TGConnectingPoint num="32" id="6472" />
-<TGConnectingPoint num="33" id="6473" />
-<TGConnectingPoint num="34" id="6474" />
-<TGConnectingPoint num="35" id="6475" />
-<TGConnectingPoint num="36" id="6476" />
-<TGConnectingPoint num="37" id="6477" />
-<TGConnectingPoint num="38" id="6478" />
-<TGConnectingPoint num="39" id="6479" />
-<extraparam>
-</extraparam>
+<infoparam name="Receive signal" value="chin(m5)" />
+<TGConnectingPoint num="0" id="4629" />
+<TGConnectingPoint num="1" id="4630" />
+<TGConnectingPoint num="2" id="4631" />
+<TGConnectingPoint num="3" id="4632" />
+<TGConnectingPoint num="4" id="4633" />
+<TGConnectingPoint num="5" id="4634" />
+<TGConnectingPoint num="6" id="4635" />
+<TGConnectingPoint num="7" id="4636" />
+<TGConnectingPoint num="8" id="4637" />
+<TGConnectingPoint num="9" id="4638" />
 </COMPONENT>
 
-<COMPONENT type="301" id="6497" >
-<cdparam x="729" y="1779" />
-<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="4656" >
+<cdparam x="692" y="1907" />
+<sizeparam width="276" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Encrypt secret data with new symmetric key
+<infoparam name="UML Note" value="Receive and verify message with secret data
 " />
-<TGConnectingPoint num="0" id="6481" />
-<TGConnectingPoint num="1" id="6482" />
-<TGConnectingPoint num="2" id="6483" />
-<TGConnectingPoint num="3" id="6484" />
-<TGConnectingPoint num="4" id="6485" />
-<TGConnectingPoint num="5" id="6486" />
-<TGConnectingPoint num="6" id="6487" />
-<TGConnectingPoint num="7" id="6488" />
-<TGConnectingPoint num="8" id="6489" />
-<TGConnectingPoint num="9" id="6490" />
-<TGConnectingPoint num="10" id="6491" />
-<TGConnectingPoint num="11" id="6492" />
-<TGConnectingPoint num="12" id="6493" />
-<TGConnectingPoint num="13" id="6494" />
-<TGConnectingPoint num="14" id="6495" />
-<TGConnectingPoint num="15" id="6496" />
+<TGConnectingPoint num="0" id="4640" />
+<TGConnectingPoint num="1" id="4641" />
+<TGConnectingPoint num="2" id="4642" />
+<TGConnectingPoint num="3" id="4643" />
+<TGConnectingPoint num="4" id="4644" />
+<TGConnectingPoint num="5" id="4645" />
+<TGConnectingPoint num="6" id="4646" />
+<TGConnectingPoint num="7" id="4647" />
+<TGConnectingPoint num="8" id="4648" />
+<TGConnectingPoint num="9" id="4649" />
+<TGConnectingPoint num="10" id="4650" />
+<TGConnectingPoint num="11" id="4651" />
+<TGConnectingPoint num="12" id="4652" />
+<TGConnectingPoint num="13" id="4653" />
+<TGConnectingPoint num="14" id="4654" />
+<TGConnectingPoint num="15" id="4655" />
 <extraparam>
-<Line value="Encrypt secret data with new symmetric key" />
+<Line value="Receive and verify message with secret data" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6538" >
-<cdparam x="543" y="1781" />
+<COMPONENT type="5106" id="4697" >
+<cdparam x="490" y="1911" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg5" />
-<TGConnectingPoint num="0" id="6498" />
-<TGConnectingPoint num="1" id="6499" />
-<TGConnectingPoint num="2" id="6500" />
-<TGConnectingPoint num="3" id="6501" />
-<TGConnectingPoint num="4" id="6502" />
-<TGConnectingPoint num="5" id="6503" />
-<TGConnectingPoint num="6" id="6504" />
-<TGConnectingPoint num="7" id="6505" />
-<TGConnectingPoint num="8" id="6506" />
-<TGConnectingPoint num="9" id="6507" />
-<TGConnectingPoint num="10" id="6508" />
-<TGConnectingPoint num="11" id="6509" />
-<TGConnectingPoint num="12" id="6510" />
-<TGConnectingPoint num="13" id="6511" />
-<TGConnectingPoint num="14" id="6512" />
-<TGConnectingPoint num="15" id="6513" />
-<TGConnectingPoint num="16" id="6514" />
-<TGConnectingPoint num="17" id="6515" />
-<TGConnectingPoint num="18" id="6516" />
-<TGConnectingPoint num="19" id="6517" />
-<TGConnectingPoint num="20" id="6518" />
-<TGConnectingPoint num="21" id="6519" />
-<TGConnectingPoint num="22" id="6520" />
-<TGConnectingPoint num="23" id="6521" />
-<TGConnectingPoint num="24" id="6522" />
-<TGConnectingPoint num="25" id="6523" />
-<TGConnectingPoint num="26" id="6524" />
-<TGConnectingPoint num="27" id="6525" />
-<TGConnectingPoint num="28" id="6526" />
-<TGConnectingPoint num="29" id="6527" />
-<TGConnectingPoint num="30" id="6528" />
-<TGConnectingPoint num="31" id="6529" />
-<TGConnectingPoint num="32" id="6530" />
-<TGConnectingPoint num="33" id="6531" />
-<TGConnectingPoint num="34" id="6532" />
-<TGConnectingPoint num="35" id="6533" />
-<TGConnectingPoint num="36" id="6534" />
-<TGConnectingPoint num="37" id="6535" />
-<TGConnectingPoint num="38" id="6536" />
-<TGConnectingPoint num="39" id="6537" />
+<infoparam name="state0" value="WaitForMsg5" />
+<TGConnectingPoint num="0" id="4657" />
+<TGConnectingPoint num="1" id="4658" />
+<TGConnectingPoint num="2" id="4659" />
+<TGConnectingPoint num="3" id="4660" />
+<TGConnectingPoint num="4" id="4661" />
+<TGConnectingPoint num="5" id="4662" />
+<TGConnectingPoint num="6" id="4663" />
+<TGConnectingPoint num="7" id="4664" />
+<TGConnectingPoint num="8" id="4665" />
+<TGConnectingPoint num="9" id="4666" />
+<TGConnectingPoint num="10" id="4667" />
+<TGConnectingPoint num="11" id="4668" />
+<TGConnectingPoint num="12" id="4669" />
+<TGConnectingPoint num="13" id="4670" />
+<TGConnectingPoint num="14" id="4671" />
+<TGConnectingPoint num="15" id="4672" />
+<TGConnectingPoint num="16" id="4673" />
+<TGConnectingPoint num="17" id="4674" />
+<TGConnectingPoint num="18" id="4675" />
+<TGConnectingPoint num="19" id="4676" />
+<TGConnectingPoint num="20" id="4677" />
+<TGConnectingPoint num="21" id="4678" />
+<TGConnectingPoint num="22" id="4679" />
+<TGConnectingPoint num="23" id="4680" />
+<TGConnectingPoint num="24" id="4681" />
+<TGConnectingPoint num="25" id="4682" />
+<TGConnectingPoint num="26" id="4683" />
+<TGConnectingPoint num="27" id="4684" />
+<TGConnectingPoint num="28" id="4685" />
+<TGConnectingPoint num="29" id="4686" />
+<TGConnectingPoint num="30" id="4687" />
+<TGConnectingPoint num="31" id="4688" />
+<TGConnectingPoint num="32" id="4689" />
+<TGConnectingPoint num="33" id="4690" />
+<TGConnectingPoint num="34" id="4691" />
+<TGConnectingPoint num="35" id="4692" />
+<TGConnectingPoint num="36" id="4693" />
+<TGConnectingPoint num="37" id="4694" />
+<TGConnectingPoint num="38" id="4695" />
+<TGConnectingPoint num="39" id="4696" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6579" >
-<cdparam x="371" y="1780" />
-<sizeparam width="121" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="4708" >
+<cdparam x="485" y="1858" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state0" value="UnexpectedMsg4" />
-<TGConnectingPoint num="0" id="6539" />
-<TGConnectingPoint num="1" id="6540" />
-<TGConnectingPoint num="2" id="6541" />
-<TGConnectingPoint num="3" id="6542" />
-<TGConnectingPoint num="4" id="6543" />
-<TGConnectingPoint num="5" id="6544" />
-<TGConnectingPoint num="6" id="6545" />
-<TGConnectingPoint num="7" id="6546" />
-<TGConnectingPoint num="8" id="6547" />
-<TGConnectingPoint num="9" id="6548" />
-<TGConnectingPoint num="10" id="6549" />
-<TGConnectingPoint num="11" id="6550" />
-<TGConnectingPoint num="12" id="6551" />
-<TGConnectingPoint num="13" id="6552" />
-<TGConnectingPoint num="14" id="6553" />
-<TGConnectingPoint num="15" id="6554" />
-<TGConnectingPoint num="16" id="6555" />
-<TGConnectingPoint num="17" id="6556" />
-<TGConnectingPoint num="18" id="6557" />
-<TGConnectingPoint num="19" id="6558" />
-<TGConnectingPoint num="20" id="6559" />
-<TGConnectingPoint num="21" id="6560" />
-<TGConnectingPoint num="22" id="6561" />
-<TGConnectingPoint num="23" id="6562" />
-<TGConnectingPoint num="24" id="6563" />
-<TGConnectingPoint num="25" id="6564" />
-<TGConnectingPoint num="26" id="6565" />
-<TGConnectingPoint num="27" id="6566" />
-<TGConnectingPoint num="28" id="6567" />
-<TGConnectingPoint num="29" id="6568" />
-<TGConnectingPoint num="30" id="6569" />
-<TGConnectingPoint num="31" id="6570" />
-<TGConnectingPoint num="32" id="6571" />
-<TGConnectingPoint num="33" id="6572" />
-<TGConnectingPoint num="34" id="6573" />
-<TGConnectingPoint num="35" id="6574" />
-<TGConnectingPoint num="36" id="6575" />
-<TGConnectingPoint num="37" id="6576" />
-<TGConnectingPoint num="38" id="6577" />
-<TGConnectingPoint num="39" id="6578" />
+<infoparam name="Send signal" value="chout(m4)" />
+<TGConnectingPoint num="0" id="4698" />
+<TGConnectingPoint num="1" id="4699" />
+<TGConnectingPoint num="2" id="4700" />
+<TGConnectingPoint num="3" id="4701" />
+<TGConnectingPoint num="4" id="4702" />
+<TGConnectingPoint num="5" id="4703" />
+<TGConnectingPoint num="6" id="4704" />
+<TGConnectingPoint num="7" id="4705" />
+<TGConnectingPoint num="8" id="4706" />
+<TGConnectingPoint num="9" id="4707" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="4749" >
+<cdparam x="483" y="1783" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="SendMsg4" />
+<TGConnectingPoint num="0" id="4709" />
+<TGConnectingPoint num="1" id="4710" />
+<TGConnectingPoint num="2" id="4711" />
+<TGConnectingPoint num="3" id="4712" />
+<TGConnectingPoint num="4" id="4713" />
+<TGConnectingPoint num="5" id="4714" />
+<TGConnectingPoint num="6" id="4715" />
+<TGConnectingPoint num="7" id="4716" />
+<TGConnectingPoint num="8" id="4717" />
+<TGConnectingPoint num="9" id="4718" />
+<TGConnectingPoint num="10" id="4719" />
+<TGConnectingPoint num="11" id="4720" />
+<TGConnectingPoint num="12" id="4721" />
+<TGConnectingPoint num="13" id="4722" />
+<TGConnectingPoint num="14" id="4723" />
+<TGConnectingPoint num="15" id="4724" />
+<TGConnectingPoint num="16" id="4725" />
+<TGConnectingPoint num="17" id="4726" />
+<TGConnectingPoint num="18" id="4727" />
+<TGConnectingPoint num="19" id="4728" />
+<TGConnectingPoint num="20" id="4729" />
+<TGConnectingPoint num="21" id="4730" />
+<TGConnectingPoint num="22" id="4731" />
+<TGConnectingPoint num="23" id="4732" />
+<TGConnectingPoint num="24" id="4733" />
+<TGConnectingPoint num="25" id="4734" />
+<TGConnectingPoint num="26" id="4735" />
+<TGConnectingPoint num="27" id="4736" />
+<TGConnectingPoint num="28" id="4737" />
+<TGConnectingPoint num="29" id="4738" />
+<TGConnectingPoint num="30" id="4739" />
+<TGConnectingPoint num="31" id="4740" />
+<TGConnectingPoint num="32" id="4741" />
+<TGConnectingPoint num="33" id="4742" />
+<TGConnectingPoint num="34" id="4743" />
+<TGConnectingPoint num="35" id="4744" />
+<TGConnectingPoint num="36" id="4745" />
+<TGConnectingPoint num="37" id="4746" />
+<TGConnectingPoint num="38" id="4747" />
+<TGConnectingPoint num="39" id="4748" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6620" >
-<cdparam x="484" y="1674" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="4790" >
+<cdparam x="470" y="1625" />
+<sizeparam width="124" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Verifyack4" />
-<TGConnectingPoint num="0" id="6580" />
-<TGConnectingPoint num="1" id="6581" />
-<TGConnectingPoint num="2" id="6582" />
-<TGConnectingPoint num="3" id="6583" />
-<TGConnectingPoint num="4" id="6584" />
-<TGConnectingPoint num="5" id="6585" />
-<TGConnectingPoint num="6" id="6586" />
-<TGConnectingPoint num="7" id="6587" />
-<TGConnectingPoint num="8" id="6588" />
-<TGConnectingPoint num="9" id="6589" />
-<TGConnectingPoint num="10" id="6590" />
-<TGConnectingPoint num="11" id="6591" />
-<TGConnectingPoint num="12" id="6592" />
-<TGConnectingPoint num="13" id="6593" />
-<TGConnectingPoint num="14" id="6594" />
-<TGConnectingPoint num="15" id="6595" />
-<TGConnectingPoint num="16" id="6596" />
-<TGConnectingPoint num="17" id="6597" />
-<TGConnectingPoint num="18" id="6598" />
-<TGConnectingPoint num="19" id="6599" />
-<TGConnectingPoint num="20" id="6600" />
-<TGConnectingPoint num="21" id="6601" />
-<TGConnectingPoint num="22" id="6602" />
-<TGConnectingPoint num="23" id="6603" />
-<TGConnectingPoint num="24" id="6604" />
-<TGConnectingPoint num="25" id="6605" />
-<TGConnectingPoint num="26" id="6606" />
-<TGConnectingPoint num="27" id="6607" />
-<TGConnectingPoint num="28" id="6608" />
-<TGConnectingPoint num="29" id="6609" />
-<TGConnectingPoint num="30" id="6610" />
-<TGConnectingPoint num="31" id="6611" />
-<TGConnectingPoint num="32" id="6612" />
-<TGConnectingPoint num="33" id="6613" />
-<TGConnectingPoint num="34" id="6614" />
-<TGConnectingPoint num="35" id="6615" />
-<TGConnectingPoint num="36" id="6616" />
-<TGConnectingPoint num="37" id="6617" />
-<TGConnectingPoint num="38" id="6618" />
-<TGConnectingPoint num="39" id="6619" />
+<infoparam name="state0" value="AdoptSessionKey" />
+<TGConnectingPoint num="0" id="4750" />
+<TGConnectingPoint num="1" id="4751" />
+<TGConnectingPoint num="2" id="4752" />
+<TGConnectingPoint num="3" id="4753" />
+<TGConnectingPoint num="4" id="4754" />
+<TGConnectingPoint num="5" id="4755" />
+<TGConnectingPoint num="6" id="4756" />
+<TGConnectingPoint num="7" id="4757" />
+<TGConnectingPoint num="8" id="4758" />
+<TGConnectingPoint num="9" id="4759" />
+<TGConnectingPoint num="10" id="4760" />
+<TGConnectingPoint num="11" id="4761" />
+<TGConnectingPoint num="12" id="4762" />
+<TGConnectingPoint num="13" id="4763" />
+<TGConnectingPoint num="14" id="4764" />
+<TGConnectingPoint num="15" id="4765" />
+<TGConnectingPoint num="16" id="4766" />
+<TGConnectingPoint num="17" id="4767" />
+<TGConnectingPoint num="18" id="4768" />
+<TGConnectingPoint num="19" id="4769" />
+<TGConnectingPoint num="20" id="4770" />
+<TGConnectingPoint num="21" id="4771" />
+<TGConnectingPoint num="22" id="4772" />
+<TGConnectingPoint num="23" id="4773" />
+<TGConnectingPoint num="24" id="4774" />
+<TGConnectingPoint num="25" id="4775" />
+<TGConnectingPoint num="26" id="4776" />
+<TGConnectingPoint num="27" id="4777" />
+<TGConnectingPoint num="28" id="4778" />
+<TGConnectingPoint num="29" id="4779" />
+<TGConnectingPoint num="30" id="4780" />
+<TGConnectingPoint num="31" id="4781" />
+<TGConnectingPoint num="32" id="4782" />
+<TGConnectingPoint num="33" id="4783" />
+<TGConnectingPoint num="34" id="4784" />
+<TGConnectingPoint num="35" id="4785" />
+<TGConnectingPoint num="36" id="4786" />
+<TGConnectingPoint num="37" id="4787" />
+<TGConnectingPoint num="38" id="4788" />
+<TGConnectingPoint num="39" id="4789" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6661" >
-<cdparam x="306" y="1673" />
+<COMPONENT type="5106" id="4831" >
+<cdparam x="326" y="1623" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig4" />
-<TGConnectingPoint num="0" id="6621" />
-<TGConnectingPoint num="1" id="6622" />
-<TGConnectingPoint num="2" id="6623" />
-<TGConnectingPoint num="3" id="6624" />
-<TGConnectingPoint num="4" id="6625" />
-<TGConnectingPoint num="5" id="6626" />
-<TGConnectingPoint num="6" id="6627" />
-<TGConnectingPoint num="7" id="6628" />
-<TGConnectingPoint num="8" id="6629" />
-<TGConnectingPoint num="9" id="6630" />
-<TGConnectingPoint num="10" id="6631" />
-<TGConnectingPoint num="11" id="6632" />
-<TGConnectingPoint num="12" id="6633" />
-<TGConnectingPoint num="13" id="6634" />
-<TGConnectingPoint num="14" id="6635" />
-<TGConnectingPoint num="15" id="6636" />
-<TGConnectingPoint num="16" id="6637" />
-<TGConnectingPoint num="17" id="6638" />
-<TGConnectingPoint num="18" id="6639" />
-<TGConnectingPoint num="19" id="6640" />
-<TGConnectingPoint num="20" id="6641" />
-<TGConnectingPoint num="21" id="6642" />
-<TGConnectingPoint num="22" id="6643" />
-<TGConnectingPoint num="23" id="6644" />
-<TGConnectingPoint num="24" id="6645" />
-<TGConnectingPoint num="25" id="6646" />
-<TGConnectingPoint num="26" id="6647" />
-<TGConnectingPoint num="27" id="6648" />
-<TGConnectingPoint num="28" id="6649" />
-<TGConnectingPoint num="29" id="6650" />
-<TGConnectingPoint num="30" id="6651" />
-<TGConnectingPoint num="31" id="6652" />
-<TGConnectingPoint num="32" id="6653" />
-<TGConnectingPoint num="33" id="6654" />
-<TGConnectingPoint num="34" id="6655" />
-<TGConnectingPoint num="35" id="6656" />
-<TGConnectingPoint num="36" id="6657" />
-<TGConnectingPoint num="37" id="6658" />
-<TGConnectingPoint num="38" id="6659" />
-<TGConnectingPoint num="39" id="6660" />
+<infoparam name="state0" value="InvalidSig3" />
+<TGConnectingPoint num="0" id="4791" />
+<TGConnectingPoint num="1" id="4792" />
+<TGConnectingPoint num="2" id="4793" />
+<TGConnectingPoint num="3" id="4794" />
+<TGConnectingPoint num="4" id="4795" />
+<TGConnectingPoint num="5" id="4796" />
+<TGConnectingPoint num="6" id="4797" />
+<TGConnectingPoint num="7" id="4798" />
+<TGConnectingPoint num="8" id="4799" />
+<TGConnectingPoint num="9" id="4800" />
+<TGConnectingPoint num="10" id="4801" />
+<TGConnectingPoint num="11" id="4802" />
+<TGConnectingPoint num="12" id="4803" />
+<TGConnectingPoint num="13" id="4804" />
+<TGConnectingPoint num="14" id="4805" />
+<TGConnectingPoint num="15" id="4806" />
+<TGConnectingPoint num="16" id="4807" />
+<TGConnectingPoint num="17" id="4808" />
+<TGConnectingPoint num="18" id="4809" />
+<TGConnectingPoint num="19" id="4810" />
+<TGConnectingPoint num="20" id="4811" />
+<TGConnectingPoint num="21" id="4812" />
+<TGConnectingPoint num="22" id="4813" />
+<TGConnectingPoint num="23" id="4814" />
+<TGConnectingPoint num="24" id="4815" />
+<TGConnectingPoint num="25" id="4816" />
+<TGConnectingPoint num="26" id="4817" />
+<TGConnectingPoint num="27" id="4818" />
+<TGConnectingPoint num="28" id="4819" />
+<TGConnectingPoint num="29" id="4820" />
+<TGConnectingPoint num="30" id="4821" />
+<TGConnectingPoint num="31" id="4822" />
+<TGConnectingPoint num="32" id="4823" />
+<TGConnectingPoint num="33" id="4824" />
+<TGConnectingPoint num="34" id="4825" />
+<TGConnectingPoint num="35" id="4826" />
+<TGConnectingPoint num="36" id="4827" />
+<TGConnectingPoint num="37" id="4828" />
+<TGConnectingPoint num="38" id="4829" />
+<TGConnectingPoint num="39" id="4830" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6702" >
-<cdparam x="429" y="1583" />
+<COMPONENT type="5106" id="4872" >
+<cdparam x="421" y="1506" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig4" />
-<TGConnectingPoint num="0" id="6662" />
-<TGConnectingPoint num="1" id="6663" />
-<TGConnectingPoint num="2" id="6664" />
-<TGConnectingPoint num="3" id="6665" />
-<TGConnectingPoint num="4" id="6666" />
-<TGConnectingPoint num="5" id="6667" />
-<TGConnectingPoint num="6" id="6668" />
-<TGConnectingPoint num="7" id="6669" />
-<TGConnectingPoint num="8" id="6670" />
-<TGConnectingPoint num="9" id="6671" />
-<TGConnectingPoint num="10" id="6672" />
-<TGConnectingPoint num="11" id="6673" />
-<TGConnectingPoint num="12" id="6674" />
-<TGConnectingPoint num="13" id="6675" />
-<TGConnectingPoint num="14" id="6676" />
-<TGConnectingPoint num="15" id="6677" />
-<TGConnectingPoint num="16" id="6678" />
-<TGConnectingPoint num="17" id="6679" />
-<TGConnectingPoint num="18" id="6680" />
-<TGConnectingPoint num="19" id="6681" />
-<TGConnectingPoint num="20" id="6682" />
-<TGConnectingPoint num="21" id="6683" />
-<TGConnectingPoint num="22" id="6684" />
-<TGConnectingPoint num="23" id="6685" />
-<TGConnectingPoint num="24" id="6686" />
-<TGConnectingPoint num="25" id="6687" />
-<TGConnectingPoint num="26" id="6688" />
-<TGConnectingPoint num="27" id="6689" />
-<TGConnectingPoint num="28" id="6690" />
-<TGConnectingPoint num="29" id="6691" />
-<TGConnectingPoint num="30" id="6692" />
-<TGConnectingPoint num="31" id="6693" />
-<TGConnectingPoint num="32" id="6694" />
-<TGConnectingPoint num="33" id="6695" />
-<TGConnectingPoint num="34" id="6696" />
-<TGConnectingPoint num="35" id="6697" />
-<TGConnectingPoint num="36" id="6698" />
-<TGConnectingPoint num="37" id="6699" />
-<TGConnectingPoint num="38" id="6700" />
-<TGConnectingPoint num="39" id="6701" />
+<infoparam name="state0" value="VerifySig3" />
+<TGConnectingPoint num="0" id="4832" />
+<TGConnectingPoint num="1" id="4833" />
+<TGConnectingPoint num="2" id="4834" />
+<TGConnectingPoint num="3" id="4835" />
+<TGConnectingPoint num="4" id="4836" />
+<TGConnectingPoint num="5" id="4837" />
+<TGConnectingPoint num="6" id="4838" />
+<TGConnectingPoint num="7" id="4839" />
+<TGConnectingPoint num="8" id="4840" />
+<TGConnectingPoint num="9" id="4841" />
+<TGConnectingPoint num="10" id="4842" />
+<TGConnectingPoint num="11" id="4843" />
+<TGConnectingPoint num="12" id="4844" />
+<TGConnectingPoint num="13" id="4845" />
+<TGConnectingPoint num="14" id="4846" />
+<TGConnectingPoint num="15" id="4847" />
+<TGConnectingPoint num="16" id="4848" />
+<TGConnectingPoint num="17" id="4849" />
+<TGConnectingPoint num="18" id="4850" />
+<TGConnectingPoint num="19" id="4851" />
+<TGConnectingPoint num="20" id="4852" />
+<TGConnectingPoint num="21" id="4853" />
+<TGConnectingPoint num="22" id="4854" />
+<TGConnectingPoint num="23" id="4855" />
+<TGConnectingPoint num="24" id="4856" />
+<TGConnectingPoint num="25" id="4857" />
+<TGConnectingPoint num="26" id="4858" />
+<TGConnectingPoint num="27" id="4859" />
+<TGConnectingPoint num="28" id="4860" />
+<TGConnectingPoint num="29" id="4861" />
+<TGConnectingPoint num="30" id="4862" />
+<TGConnectingPoint num="31" id="4863" />
+<TGConnectingPoint num="32" id="4864" />
+<TGConnectingPoint num="33" id="4865" />
+<TGConnectingPoint num="34" id="4866" />
+<TGConnectingPoint num="35" id="4867" />
+<TGConnectingPoint num="36" id="4868" />
+<TGConnectingPoint num="37" id="4869" />
+<TGConnectingPoint num="38" id="4870" />
+<TGConnectingPoint num="39" id="4871" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6743" >
-<cdparam x="227" y="1579" />
+<COMPONENT type="5106" id="4913" >
+<cdparam x="264" y="1507" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts4" />
-<TGConnectingPoint num="0" id="6703" />
-<TGConnectingPoint num="1" id="6704" />
-<TGConnectingPoint num="2" id="6705" />
-<TGConnectingPoint num="3" id="6706" />
-<TGConnectingPoint num="4" id="6707" />
-<TGConnectingPoint num="5" id="6708" />
-<TGConnectingPoint num="6" id="6709" />
-<TGConnectingPoint num="7" id="6710" />
-<TGConnectingPoint num="8" id="6711" />
-<TGConnectingPoint num="9" id="6712" />
-<TGConnectingPoint num="10" id="6713" />
-<TGConnectingPoint num="11" id="6714" />
-<TGConnectingPoint num="12" id="6715" />
-<TGConnectingPoint num="13" id="6716" />
-<TGConnectingPoint num="14" id="6717" />
-<TGConnectingPoint num="15" id="6718" />
-<TGConnectingPoint num="16" id="6719" />
-<TGConnectingPoint num="17" id="6720" />
-<TGConnectingPoint num="18" id="6721" />
-<TGConnectingPoint num="19" id="6722" />
-<TGConnectingPoint num="20" id="6723" />
-<TGConnectingPoint num="21" id="6724" />
-<TGConnectingPoint num="22" id="6725" />
-<TGConnectingPoint num="23" id="6726" />
-<TGConnectingPoint num="24" id="6727" />
-<TGConnectingPoint num="25" id="6728" />
-<TGConnectingPoint num="26" id="6729" />
-<TGConnectingPoint num="27" id="6730" />
-<TGConnectingPoint num="28" id="6731" />
-<TGConnectingPoint num="29" id="6732" />
-<TGConnectingPoint num="30" id="6733" />
-<TGConnectingPoint num="31" id="6734" />
-<TGConnectingPoint num="32" id="6735" />
-<TGConnectingPoint num="33" id="6736" />
-<TGConnectingPoint num="34" id="6737" />
-<TGConnectingPoint num="35" id="6738" />
-<TGConnectingPoint num="36" id="6739" />
-<TGConnectingPoint num="37" id="6740" />
-<TGConnectingPoint num="38" id="6741" />
-<TGConnectingPoint num="39" id="6742" />
+<infoparam name="state0" value="Invalidts3" />
+<TGConnectingPoint num="0" id="4873" />
+<TGConnectingPoint num="1" id="4874" />
+<TGConnectingPoint num="2" id="4875" />
+<TGConnectingPoint num="3" id="4876" />
+<TGConnectingPoint num="4" id="4877" />
+<TGConnectingPoint num="5" id="4878" />
+<TGConnectingPoint num="6" id="4879" />
+<TGConnectingPoint num="7" id="4880" />
+<TGConnectingPoint num="8" id="4881" />
+<TGConnectingPoint num="9" id="4882" />
+<TGConnectingPoint num="10" id="4883" />
+<TGConnectingPoint num="11" id="4884" />
+<TGConnectingPoint num="12" id="4885" />
+<TGConnectingPoint num="13" id="4886" />
+<TGConnectingPoint num="14" id="4887" />
+<TGConnectingPoint num="15" id="4888" />
+<TGConnectingPoint num="16" id="4889" />
+<TGConnectingPoint num="17" id="4890" />
+<TGConnectingPoint num="18" id="4891" />
+<TGConnectingPoint num="19" id="4892" />
+<TGConnectingPoint num="20" id="4893" />
+<TGConnectingPoint num="21" id="4894" />
+<TGConnectingPoint num="22" id="4895" />
+<TGConnectingPoint num="23" id="4896" />
+<TGConnectingPoint num="24" id="4897" />
+<TGConnectingPoint num="25" id="4898" />
+<TGConnectingPoint num="26" id="4899" />
+<TGConnectingPoint num="27" id="4900" />
+<TGConnectingPoint num="28" id="4901" />
+<TGConnectingPoint num="29" id="4902" />
+<TGConnectingPoint num="30" id="4903" />
+<TGConnectingPoint num="31" id="4904" />
+<TGConnectingPoint num="32" id="4905" />
+<TGConnectingPoint num="33" id="4906" />
+<TGConnectingPoint num="34" id="4907" />
+<TGConnectingPoint num="35" id="4908" />
+<TGConnectingPoint num="36" id="4909" />
+<TGConnectingPoint num="37" id="4910" />
+<TGConnectingPoint num="38" id="4911" />
+<TGConnectingPoint num="39" id="4912" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6784" >
-<cdparam x="350" y="1491" />
+<COMPONENT type="5106" id="4954" >
+<cdparam x="356" y="1402" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts4" />
-<TGConnectingPoint num="0" id="6744" />
-<TGConnectingPoint num="1" id="6745" />
-<TGConnectingPoint num="2" id="6746" />
-<TGConnectingPoint num="3" id="6747" />
-<TGConnectingPoint num="4" id="6748" />
-<TGConnectingPoint num="5" id="6749" />
-<TGConnectingPoint num="6" id="6750" />
-<TGConnectingPoint num="7" id="6751" />
-<TGConnectingPoint num="8" id="6752" />
-<TGConnectingPoint num="9" id="6753" />
-<TGConnectingPoint num="10" id="6754" />
-<TGConnectingPoint num="11" id="6755" />
-<TGConnectingPoint num="12" id="6756" />
-<TGConnectingPoint num="13" id="6757" />
-<TGConnectingPoint num="14" id="6758" />
-<TGConnectingPoint num="15" id="6759" />
-<TGConnectingPoint num="16" id="6760" />
-<TGConnectingPoint num="17" id="6761" />
-<TGConnectingPoint num="18" id="6762" />
-<TGConnectingPoint num="19" id="6763" />
-<TGConnectingPoint num="20" id="6764" />
-<TGConnectingPoint num="21" id="6765" />
-<TGConnectingPoint num="22" id="6766" />
-<TGConnectingPoint num="23" id="6767" />
-<TGConnectingPoint num="24" id="6768" />
-<TGConnectingPoint num="25" id="6769" />
-<TGConnectingPoint num="26" id="6770" />
-<TGConnectingPoint num="27" id="6771" />
-<TGConnectingPoint num="28" id="6772" />
-<TGConnectingPoint num="29" id="6773" />
-<TGConnectingPoint num="30" id="6774" />
-<TGConnectingPoint num="31" id="6775" />
-<TGConnectingPoint num="32" id="6776" />
-<TGConnectingPoint num="33" id="6777" />
-<TGConnectingPoint num="34" id="6778" />
-<TGConnectingPoint num="35" id="6779" />
-<TGConnectingPoint num="36" id="6780" />
-<TGConnectingPoint num="37" id="6781" />
-<TGConnectingPoint num="38" id="6782" />
-<TGConnectingPoint num="39" id="6783" />
+<infoparam name="state0" value="Testts3" />
+<TGConnectingPoint num="0" id="4914" />
+<TGConnectingPoint num="1" id="4915" />
+<TGConnectingPoint num="2" id="4916" />
+<TGConnectingPoint num="3" id="4917" />
+<TGConnectingPoint num="4" id="4918" />
+<TGConnectingPoint num="5" id="4919" />
+<TGConnectingPoint num="6" id="4920" />
+<TGConnectingPoint num="7" id="4921" />
+<TGConnectingPoint num="8" id="4922" />
+<TGConnectingPoint num="9" id="4923" />
+<TGConnectingPoint num="10" id="4924" />
+<TGConnectingPoint num="11" id="4925" />
+<TGConnectingPoint num="12" id="4926" />
+<TGConnectingPoint num="13" id="4927" />
+<TGConnectingPoint num="14" id="4928" />
+<TGConnectingPoint num="15" id="4929" />
+<TGConnectingPoint num="16" id="4930" />
+<TGConnectingPoint num="17" id="4931" />
+<TGConnectingPoint num="18" id="4932" />
+<TGConnectingPoint num="19" id="4933" />
+<TGConnectingPoint num="20" id="4934" />
+<TGConnectingPoint num="21" id="4935" />
+<TGConnectingPoint num="22" id="4936" />
+<TGConnectingPoint num="23" id="4937" />
+<TGConnectingPoint num="24" id="4938" />
+<TGConnectingPoint num="25" id="4939" />
+<TGConnectingPoint num="26" id="4940" />
+<TGConnectingPoint num="27" id="4941" />
+<TGConnectingPoint num="28" id="4942" />
+<TGConnectingPoint num="29" id="4943" />
+<TGConnectingPoint num="30" id="4944" />
+<TGConnectingPoint num="31" id="4945" />
+<TGConnectingPoint num="32" id="4946" />
+<TGConnectingPoint num="33" id="4947" />
+<TGConnectingPoint num="34" id="4948" />
+<TGConnectingPoint num="35" id="4949" />
+<TGConnectingPoint num="36" id="4950" />
+<TGConnectingPoint num="37" id="4951" />
+<TGConnectingPoint num="38" id="4952" />
+<TGConnectingPoint num="39" id="4953" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="6795" >
-<cdparam x="356" y="1410" />
+<COMPONENT type="5104" id="4965" >
+<cdparam x="378" y="1316" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Receive signal" value="chin(m4)" />
-<TGConnectingPoint num="0" id="6785" />
-<TGConnectingPoint num="1" id="6786" />
-<TGConnectingPoint num="2" id="6787" />
-<TGConnectingPoint num="3" id="6788" />
-<TGConnectingPoint num="4" id="6789" />
-<TGConnectingPoint num="5" id="6790" />
-<TGConnectingPoint num="6" id="6791" />
-<TGConnectingPoint num="7" id="6792" />
-<TGConnectingPoint num="8" id="6793" />
-<TGConnectingPoint num="9" id="6794" />
+<infoparam name="Receive signal" value="chin(m3)" />
+<TGConnectingPoint num="0" id="4955" />
+<TGConnectingPoint num="1" id="4956" />
+<TGConnectingPoint num="2" id="4957" />
+<TGConnectingPoint num="3" id="4958" />
+<TGConnectingPoint num="4" id="4959" />
+<TGConnectingPoint num="5" id="4960" />
+<TGConnectingPoint num="6" id="4961" />
+<TGConnectingPoint num="7" id="4962" />
+<TGConnectingPoint num="8" id="4963" />
+<TGConnectingPoint num="9" id="4964" />
 </COMPONENT>
 
-<COMPONENT type="301" id="6812" >
-<cdparam x="557" y="1318" />
-<sizeparam width="273" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="4982" >
+<cdparam x="556" y="1246" />
+<sizeparam width="270" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify ack-message from ECU2
+<infoparam name="UML Note" value="Verify Message with session key from ECU1
 " />
-<TGConnectingPoint num="0" id="6796" />
-<TGConnectingPoint num="1" id="6797" />
-<TGConnectingPoint num="2" id="6798" />
-<TGConnectingPoint num="3" id="6799" />
-<TGConnectingPoint num="4" id="6800" />
-<TGConnectingPoint num="5" id="6801" />
-<TGConnectingPoint num="6" id="6802" />
-<TGConnectingPoint num="7" id="6803" />
-<TGConnectingPoint num="8" id="6804" />
-<TGConnectingPoint num="9" id="6805" />
-<TGConnectingPoint num="10" id="6806" />
-<TGConnectingPoint num="11" id="6807" />
-<TGConnectingPoint num="12" id="6808" />
-<TGConnectingPoint num="13" id="6809" />
-<TGConnectingPoint num="14" id="6810" />
-<TGConnectingPoint num="15" id="6811" />
+<TGConnectingPoint num="0" id="4966" />
+<TGConnectingPoint num="1" id="4967" />
+<TGConnectingPoint num="2" id="4968" />
+<TGConnectingPoint num="3" id="4969" />
+<TGConnectingPoint num="4" id="4970" />
+<TGConnectingPoint num="5" id="4971" />
+<TGConnectingPoint num="6" id="4972" />
+<TGConnectingPoint num="7" id="4973" />
+<TGConnectingPoint num="8" id="4974" />
+<TGConnectingPoint num="9" id="4975" />
+<TGConnectingPoint num="10" id="4976" />
+<TGConnectingPoint num="11" id="4977" />
+<TGConnectingPoint num="12" id="4978" />
+<TGConnectingPoint num="13" id="4979" />
+<TGConnectingPoint num="14" id="4980" />
+<TGConnectingPoint num="15" id="4981" />
 <extraparam>
-<Line value="Receive and verify ack-message from ECU2" />
+<Line value="Verify Message with session key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6853" >
-<cdparam x="349" y="1324" />
+<COMPONENT type="5106" id="5023" >
+<cdparam x="375" y="1247" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg4" />
-<TGConnectingPoint num="0" id="6813" />
-<TGConnectingPoint num="1" id="6814" />
-<TGConnectingPoint num="2" id="6815" />
-<TGConnectingPoint num="3" id="6816" />
-<TGConnectingPoint num="4" id="6817" />
-<TGConnectingPoint num="5" id="6818" />
-<TGConnectingPoint num="6" id="6819" />
-<TGConnectingPoint num="7" id="6820" />
-<TGConnectingPoint num="8" id="6821" />
-<TGConnectingPoint num="9" id="6822" />
-<TGConnectingPoint num="10" id="6823" />
-<TGConnectingPoint num="11" id="6824" />
-<TGConnectingPoint num="12" id="6825" />
-<TGConnectingPoint num="13" id="6826" />
-<TGConnectingPoint num="14" id="6827" />
-<TGConnectingPoint num="15" id="6828" />
-<TGConnectingPoint num="16" id="6829" />
-<TGConnectingPoint num="17" id="6830" />
-<TGConnectingPoint num="18" id="6831" />
-<TGConnectingPoint num="19" id="6832" />
-<TGConnectingPoint num="20" id="6833" />
-<TGConnectingPoint num="21" id="6834" />
-<TGConnectingPoint num="22" id="6835" />
-<TGConnectingPoint num="23" id="6836" />
-<TGConnectingPoint num="24" id="6837" />
-<TGConnectingPoint num="25" id="6838" />
-<TGConnectingPoint num="26" id="6839" />
-<TGConnectingPoint num="27" id="6840" />
-<TGConnectingPoint num="28" id="6841" />
-<TGConnectingPoint num="29" id="6842" />
-<TGConnectingPoint num="30" id="6843" />
-<TGConnectingPoint num="31" id="6844" />
-<TGConnectingPoint num="32" id="6845" />
-<TGConnectingPoint num="33" id="6846" />
-<TGConnectingPoint num="34" id="6847" />
-<TGConnectingPoint num="35" id="6848" />
-<TGConnectingPoint num="36" id="6849" />
-<TGConnectingPoint num="37" id="6850" />
-<TGConnectingPoint num="38" id="6851" />
-<TGConnectingPoint num="39" id="6852" />
+<infoparam name="state0" value="WaitForMsg3" />
+<TGConnectingPoint num="0" id="4983" />
+<TGConnectingPoint num="1" id="4984" />
+<TGConnectingPoint num="2" id="4985" />
+<TGConnectingPoint num="3" id="4986" />
+<TGConnectingPoint num="4" id="4987" />
+<TGConnectingPoint num="5" id="4988" />
+<TGConnectingPoint num="6" id="4989" />
+<TGConnectingPoint num="7" id="4990" />
+<TGConnectingPoint num="8" id="4991" />
+<TGConnectingPoint num="9" id="4992" />
+<TGConnectingPoint num="10" id="4993" />
+<TGConnectingPoint num="11" id="4994" />
+<TGConnectingPoint num="12" id="4995" />
+<TGConnectingPoint num="13" id="4996" />
+<TGConnectingPoint num="14" id="4997" />
+<TGConnectingPoint num="15" id="4998" />
+<TGConnectingPoint num="16" id="4999" />
+<TGConnectingPoint num="17" id="5000" />
+<TGConnectingPoint num="18" id="5001" />
+<TGConnectingPoint num="19" id="5002" />
+<TGConnectingPoint num="20" id="5003" />
+<TGConnectingPoint num="21" id="5004" />
+<TGConnectingPoint num="22" id="5005" />
+<TGConnectingPoint num="23" id="5006" />
+<TGConnectingPoint num="24" id="5007" />
+<TGConnectingPoint num="25" id="5008" />
+<TGConnectingPoint num="26" id="5009" />
+<TGConnectingPoint num="27" id="5010" />
+<TGConnectingPoint num="28" id="5011" />
+<TGConnectingPoint num="29" id="5012" />
+<TGConnectingPoint num="30" id="5013" />
+<TGConnectingPoint num="31" id="5014" />
+<TGConnectingPoint num="32" id="5015" />
+<TGConnectingPoint num="33" id="5016" />
+<TGConnectingPoint num="34" id="5017" />
+<TGConnectingPoint num="35" id="5018" />
+<TGConnectingPoint num="36" id="5019" />
+<TGConnectingPoint num="37" id="5020" />
+<TGConnectingPoint num="38" id="5021" />
+<TGConnectingPoint num="39" id="5022" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="6864" >
-<cdparam x="358" y="1262" />
+<COMPONENT type="5103" id="5034" >
+<cdparam x="400" y="1197" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Send signal" value="chout(m3)" />
-<TGConnectingPoint num="0" id="6854" />
-<TGConnectingPoint num="1" id="6855" />
-<TGConnectingPoint num="2" id="6856" />
-<TGConnectingPoint num="3" id="6857" />
-<TGConnectingPoint num="4" id="6858" />
-<TGConnectingPoint num="5" id="6859" />
-<TGConnectingPoint num="6" id="6860" />
-<TGConnectingPoint num="7" id="6861" />
-<TGConnectingPoint num="8" id="6862" />
-<TGConnectingPoint num="9" id="6863" />
+<infoparam name="Send signal" value="chout(m2)" />
+<TGConnectingPoint num="0" id="5024" />
+<TGConnectingPoint num="1" id="5025" />
+<TGConnectingPoint num="2" id="5026" />
+<TGConnectingPoint num="3" id="5027" />
+<TGConnectingPoint num="4" id="5028" />
+<TGConnectingPoint num="5" id="5029" />
+<TGConnectingPoint num="6" id="5030" />
+<TGConnectingPoint num="7" id="5031" />
+<TGConnectingPoint num="8" id="5032" />
+<TGConnectingPoint num="9" id="5033" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5075" >
+<cdparam x="379" y="1137" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="SendMsg2" />
+<TGConnectingPoint num="0" id="5035" />
+<TGConnectingPoint num="1" id="5036" />
+<TGConnectingPoint num="2" id="5037" />
+<TGConnectingPoint num="3" id="5038" />
+<TGConnectingPoint num="4" id="5039" />
+<TGConnectingPoint num="5" id="5040" />
+<TGConnectingPoint num="6" id="5041" />
+<TGConnectingPoint num="7" id="5042" />
+<TGConnectingPoint num="8" id="5043" />
+<TGConnectingPoint num="9" id="5044" />
+<TGConnectingPoint num="10" id="5045" />
+<TGConnectingPoint num="11" id="5046" />
+<TGConnectingPoint num="12" id="5047" />
+<TGConnectingPoint num="13" id="5048" />
+<TGConnectingPoint num="14" id="5049" />
+<TGConnectingPoint num="15" id="5050" />
+<TGConnectingPoint num="16" id="5051" />
+<TGConnectingPoint num="17" id="5052" />
+<TGConnectingPoint num="18" id="5053" />
+<TGConnectingPoint num="19" id="5054" />
+<TGConnectingPoint num="20" id="5055" />
+<TGConnectingPoint num="21" id="5056" />
+<TGConnectingPoint num="22" id="5057" />
+<TGConnectingPoint num="23" id="5058" />
+<TGConnectingPoint num="24" id="5059" />
+<TGConnectingPoint num="25" id="5060" />
+<TGConnectingPoint num="26" id="5061" />
+<TGConnectingPoint num="27" id="5062" />
+<TGConnectingPoint num="28" id="5063" />
+<TGConnectingPoint num="29" id="5064" />
+<TGConnectingPoint num="30" id="5065" />
+<TGConnectingPoint num="31" id="5066" />
+<TGConnectingPoint num="32" id="5067" />
+<TGConnectingPoint num="33" id="5068" />
+<TGConnectingPoint num="34" id="5069" />
+<TGConnectingPoint num="35" id="5070" />
+<TGConnectingPoint num="36" id="5071" />
+<TGConnectingPoint num="37" id="5072" />
+<TGConnectingPoint num="38" id="5073" />
+<TGConnectingPoint num="39" id="5074" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6905" >
-<cdparam x="335" y="1185" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5092" >
+<cdparam x="546" y="983" />
+<sizeparam width="342" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg3" />
-<TGConnectingPoint num="0" id="6865" />
-<TGConnectingPoint num="1" id="6866" />
-<TGConnectingPoint num="2" id="6867" />
-<TGConnectingPoint num="3" id="6868" />
-<TGConnectingPoint num="4" id="6869" />
-<TGConnectingPoint num="5" id="6870" />
-<TGConnectingPoint num="6" id="6871" />
-<TGConnectingPoint num="7" id="6872" />
-<TGConnectingPoint num="8" id="6873" />
-<TGConnectingPoint num="9" id="6874" />
-<TGConnectingPoint num="10" id="6875" />
-<TGConnectingPoint num="11" id="6876" />
-<TGConnectingPoint num="12" id="6877" />
-<TGConnectingPoint num="13" id="6878" />
-<TGConnectingPoint num="14" id="6879" />
-<TGConnectingPoint num="15" id="6880" />
-<TGConnectingPoint num="16" id="6881" />
-<TGConnectingPoint num="17" id="6882" />
-<TGConnectingPoint num="18" id="6883" />
-<TGConnectingPoint num="19" id="6884" />
-<TGConnectingPoint num="20" id="6885" />
-<TGConnectingPoint num="21" id="6886" />
-<TGConnectingPoint num="22" id="6887" />
-<TGConnectingPoint num="23" id="6888" />
-<TGConnectingPoint num="24" id="6889" />
-<TGConnectingPoint num="25" id="6890" />
-<TGConnectingPoint num="26" id="6891" />
-<TGConnectingPoint num="27" id="6892" />
-<TGConnectingPoint num="28" id="6893" />
-<TGConnectingPoint num="29" id="6894" />
-<TGConnectingPoint num="30" id="6895" />
-<TGConnectingPoint num="31" id="6896" />
-<TGConnectingPoint num="32" id="6897" />
-<TGConnectingPoint num="33" id="6898" />
-<TGConnectingPoint num="34" id="6899" />
-<TGConnectingPoint num="35" id="6900" />
-<TGConnectingPoint num="36" id="6901" />
-<TGConnectingPoint num="37" id="6902" />
-<TGConnectingPoint num="38" id="6903" />
-<TGConnectingPoint num="39" id="6904" />
+<infoparam name="UML Note" value="Create and send answer for ECU1: Certified pk of ECU2
+" />
+<TGConnectingPoint num="0" id="5076" />
+<TGConnectingPoint num="1" id="5077" />
+<TGConnectingPoint num="2" id="5078" />
+<TGConnectingPoint num="3" id="5079" />
+<TGConnectingPoint num="4" id="5080" />
+<TGConnectingPoint num="5" id="5081" />
+<TGConnectingPoint num="6" id="5082" />
+<TGConnectingPoint num="7" id="5083" />
+<TGConnectingPoint num="8" id="5084" />
+<TGConnectingPoint num="9" id="5085" />
+<TGConnectingPoint num="10" id="5086" />
+<TGConnectingPoint num="11" id="5087" />
+<TGConnectingPoint num="12" id="5088" />
+<TGConnectingPoint num="13" id="5089" />
+<TGConnectingPoint num="14" id="5090" />
+<TGConnectingPoint num="15" id="5091" />
 <extraparam>
+<Line value="Create and send answer for ECU1: Certified pk of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="6922" >
-<cdparam x="526" y="1019" />
-<sizeparam width="414" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5109" >
+<cdparam x="453" y="555" />
+<sizeparam width="324" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create and send m3, message containing the encrypted session key
+<infoparam name="UML Note" value="Begin verifying m1: PK-Request message from ECU1
 " />
-<TGConnectingPoint num="0" id="6906" />
-<TGConnectingPoint num="1" id="6907" />
-<TGConnectingPoint num="2" id="6908" />
-<TGConnectingPoint num="3" id="6909" />
-<TGConnectingPoint num="4" id="6910" />
-<TGConnectingPoint num="5" id="6911" />
-<TGConnectingPoint num="6" id="6912" />
-<TGConnectingPoint num="7" id="6913" />
-<TGConnectingPoint num="8" id="6914" />
-<TGConnectingPoint num="9" id="6915" />
-<TGConnectingPoint num="10" id="6916" />
-<TGConnectingPoint num="11" id="6917" />
-<TGConnectingPoint num="12" id="6918" />
-<TGConnectingPoint num="13" id="6919" />
-<TGConnectingPoint num="14" id="6920" />
-<TGConnectingPoint num="15" id="6921" />
+<TGConnectingPoint num="0" id="5093" />
+<TGConnectingPoint num="1" id="5094" />
+<TGConnectingPoint num="2" id="5095" />
+<TGConnectingPoint num="3" id="5096" />
+<TGConnectingPoint num="4" id="5097" />
+<TGConnectingPoint num="5" id="5098" />
+<TGConnectingPoint num="6" id="5099" />
+<TGConnectingPoint num="7" id="5100" />
+<TGConnectingPoint num="8" id="5101" />
+<TGConnectingPoint num="9" id="5102" />
+<TGConnectingPoint num="10" id="5103" />
+<TGConnectingPoint num="11" id="5104" />
+<TGConnectingPoint num="12" id="5105" />
+<TGConnectingPoint num="13" id="5106" />
+<TGConnectingPoint num="14" id="5107" />
+<TGConnectingPoint num="15" id="5108" />
 <extraparam>
-<Line value="Create and send m3, message containing the encrypted session key" />
+<Line value="Begin verifying m1: PK-Request message from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="6963" >
-<cdparam x="338" y="1019" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="301" id="5126" >
+<cdparam x="272" y="66" />
+<sizeparam width="310" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg3" />
-<TGConnectingPoint num="0" id="6923" />
-<TGConnectingPoint num="1" id="6924" />
-<TGConnectingPoint num="2" id="6925" />
-<TGConnectingPoint num="3" id="6926" />
-<TGConnectingPoint num="4" id="6927" />
-<TGConnectingPoint num="5" id="6928" />
-<TGConnectingPoint num="6" id="6929" />
-<TGConnectingPoint num="7" id="6930" />
-<TGConnectingPoint num="8" id="6931" />
-<TGConnectingPoint num="9" id="6932" />
-<TGConnectingPoint num="10" id="6933" />
-<TGConnectingPoint num="11" id="6934" />
-<TGConnectingPoint num="12" id="6935" />
-<TGConnectingPoint num="13" id="6936" />
-<TGConnectingPoint num="14" id="6937" />
-<TGConnectingPoint num="15" id="6938" />
-<TGConnectingPoint num="16" id="6939" />
-<TGConnectingPoint num="17" id="6940" />
-<TGConnectingPoint num="18" id="6941" />
-<TGConnectingPoint num="19" id="6942" />
-<TGConnectingPoint num="20" id="6943" />
-<TGConnectingPoint num="21" id="6944" />
-<TGConnectingPoint num="22" id="6945" />
-<TGConnectingPoint num="23" id="6946" />
-<TGConnectingPoint num="24" id="6947" />
-<TGConnectingPoint num="25" id="6948" />
-<TGConnectingPoint num="26" id="6949" />
-<TGConnectingPoint num="27" id="6950" />
-<TGConnectingPoint num="28" id="6951" />
-<TGConnectingPoint num="29" id="6952" />
-<TGConnectingPoint num="30" id="6953" />
-<TGConnectingPoint num="31" id="6954" />
-<TGConnectingPoint num="32" id="6955" />
-<TGConnectingPoint num="33" id="6956" />
-<TGConnectingPoint num="34" id="6957" />
-<TGConnectingPoint num="35" id="6958" />
-<TGConnectingPoint num="36" id="6959" />
-<TGConnectingPoint num="37" id="6960" />
-<TGConnectingPoint num="38" id="6961" />
-<TGConnectingPoint num="39" id="6962" />
+<infoparam name="UML Note" value="Begin verifying m0: certified public key from ECU1
+" />
+<TGConnectingPoint num="0" id="5110" />
+<TGConnectingPoint num="1" id="5111" />
+<TGConnectingPoint num="2" id="5112" />
+<TGConnectingPoint num="3" id="5113" />
+<TGConnectingPoint num="4" id="5114" />
+<TGConnectingPoint num="5" id="5115" />
+<TGConnectingPoint num="6" id="5116" />
+<TGConnectingPoint num="7" id="5117" />
+<TGConnectingPoint num="8" id="5118" />
+<TGConnectingPoint num="9" id="5119" />
+<TGConnectingPoint num="10" id="5120" />
+<TGConnectingPoint num="11" id="5121" />
+<TGConnectingPoint num="12" id="5122" />
+<TGConnectingPoint num="13" id="5123" />
+<TGConnectingPoint num="14" id="5124" />
+<TGConnectingPoint num="15" id="5125" />
 <extraparam>
+<Line value="Begin verifying m0: certified public key from ECU1" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7004" >
-<cdparam x="160" y="1019" />
+<COMPONENT type="5106" id="5167" >
+<cdparam x="384" y="978" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidSig2" />
-<TGConnectingPoint num="0" id="6964" />
-<TGConnectingPoint num="1" id="6965" />
-<TGConnectingPoint num="2" id="6966" />
-<TGConnectingPoint num="3" id="6967" />
-<TGConnectingPoint num="4" id="6968" />
-<TGConnectingPoint num="5" id="6969" />
-<TGConnectingPoint num="6" id="6970" />
-<TGConnectingPoint num="7" id="6971" />
-<TGConnectingPoint num="8" id="6972" />
-<TGConnectingPoint num="9" id="6973" />
-<TGConnectingPoint num="10" id="6974" />
-<TGConnectingPoint num="11" id="6975" />
-<TGConnectingPoint num="12" id="6976" />
-<TGConnectingPoint num="13" id="6977" />
-<TGConnectingPoint num="14" id="6978" />
-<TGConnectingPoint num="15" id="6979" />
-<TGConnectingPoint num="16" id="6980" />
-<TGConnectingPoint num="17" id="6981" />
-<TGConnectingPoint num="18" id="6982" />
-<TGConnectingPoint num="19" id="6983" />
-<TGConnectingPoint num="20" id="6984" />
-<TGConnectingPoint num="21" id="6985" />
-<TGConnectingPoint num="22" id="6986" />
-<TGConnectingPoint num="23" id="6987" />
-<TGConnectingPoint num="24" id="6988" />
-<TGConnectingPoint num="25" id="6989" />
-<TGConnectingPoint num="26" id="6990" />
-<TGConnectingPoint num="27" id="6991" />
-<TGConnectingPoint num="28" id="6992" />
-<TGConnectingPoint num="29" id="6993" />
-<TGConnectingPoint num="30" id="6994" />
-<TGConnectingPoint num="31" id="6995" />
-<TGConnectingPoint num="32" id="6996" />
-<TGConnectingPoint num="33" id="6997" />
-<TGConnectingPoint num="34" id="6998" />
-<TGConnectingPoint num="35" id="6999" />
-<TGConnectingPoint num="36" id="7000" />
-<TGConnectingPoint num="37" id="7001" />
-<TGConnectingPoint num="38" id="7002" />
-<TGConnectingPoint num="39" id="7003" />
+<infoparam name="state0" value="ForgeMsg2" />
+<TGConnectingPoint num="0" id="5127" />
+<TGConnectingPoint num="1" id="5128" />
+<TGConnectingPoint num="2" id="5129" />
+<TGConnectingPoint num="3" id="5130" />
+<TGConnectingPoint num="4" id="5131" />
+<TGConnectingPoint num="5" id="5132" />
+<TGConnectingPoint num="6" id="5133" />
+<TGConnectingPoint num="7" id="5134" />
+<TGConnectingPoint num="8" id="5135" />
+<TGConnectingPoint num="9" id="5136" />
+<TGConnectingPoint num="10" id="5137" />
+<TGConnectingPoint num="11" id="5138" />
+<TGConnectingPoint num="12" id="5139" />
+<TGConnectingPoint num="13" id="5140" />
+<TGConnectingPoint num="14" id="5141" />
+<TGConnectingPoint num="15" id="5142" />
+<TGConnectingPoint num="16" id="5143" />
+<TGConnectingPoint num="17" id="5144" />
+<TGConnectingPoint num="18" id="5145" />
+<TGConnectingPoint num="19" id="5146" />
+<TGConnectingPoint num="20" id="5147" />
+<TGConnectingPoint num="21" id="5148" />
+<TGConnectingPoint num="22" id="5149" />
+<TGConnectingPoint num="23" id="5150" />
+<TGConnectingPoint num="24" id="5151" />
+<TGConnectingPoint num="25" id="5152" />
+<TGConnectingPoint num="26" id="5153" />
+<TGConnectingPoint num="27" id="5154" />
+<TGConnectingPoint num="28" id="5155" />
+<TGConnectingPoint num="29" id="5156" />
+<TGConnectingPoint num="30" id="5157" />
+<TGConnectingPoint num="31" id="5158" />
+<TGConnectingPoint num="32" id="5159" />
+<TGConnectingPoint num="33" id="5160" />
+<TGConnectingPoint num="34" id="5161" />
+<TGConnectingPoint num="35" id="5162" />
+<TGConnectingPoint num="36" id="5163" />
+<TGConnectingPoint num="37" id="5164" />
+<TGConnectingPoint num="38" id="5165" />
+<TGConnectingPoint num="39" id="5166" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7045" >
-<cdparam x="278" y="914" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5208" >
+<cdparam x="197" y="980" />
+<sizeparam width="107" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifySig2" />
-<TGConnectingPoint num="0" id="7005" />
-<TGConnectingPoint num="1" id="7006" />
-<TGConnectingPoint num="2" id="7007" />
-<TGConnectingPoint num="3" id="7008" />
-<TGConnectingPoint num="4" id="7009" />
-<TGConnectingPoint num="5" id="7010" />
-<TGConnectingPoint num="6" id="7011" />
-<TGConnectingPoint num="7" id="7012" />
-<TGConnectingPoint num="8" id="7013" />
-<TGConnectingPoint num="9" id="7014" />
-<TGConnectingPoint num="10" id="7015" />
-<TGConnectingPoint num="11" id="7016" />
-<TGConnectingPoint num="12" id="7017" />
-<TGConnectingPoint num="13" id="7018" />
-<TGConnectingPoint num="14" id="7019" />
-<TGConnectingPoint num="15" id="7020" />
-<TGConnectingPoint num="16" id="7021" />
-<TGConnectingPoint num="17" id="7022" />
-<TGConnectingPoint num="18" id="7023" />
-<TGConnectingPoint num="19" id="7024" />
-<TGConnectingPoint num="20" id="7025" />
-<TGConnectingPoint num="21" id="7026" />
-<TGConnectingPoint num="22" id="7027" />
-<TGConnectingPoint num="23" id="7028" />
-<TGConnectingPoint num="24" id="7029" />
-<TGConnectingPoint num="25" id="7030" />
-<TGConnectingPoint num="26" id="7031" />
-<TGConnectingPoint num="27" id="7032" />
-<TGConnectingPoint num="28" id="7033" />
-<TGConnectingPoint num="29" id="7034" />
-<TGConnectingPoint num="30" id="7035" />
-<TGConnectingPoint num="31" id="7036" />
-<TGConnectingPoint num="32" id="7037" />
-<TGConnectingPoint num="33" id="7038" />
-<TGConnectingPoint num="34" id="7039" />
-<TGConnectingPoint num="35" id="7040" />
-<TGConnectingPoint num="36" id="7041" />
-<TGConnectingPoint num="37" id="7042" />
-<TGConnectingPoint num="38" id="7043" />
-<TGConnectingPoint num="39" id="7044" />
+<infoparam name="state0" value="UnexpectedMsg" />
+<TGConnectingPoint num="0" id="5168" />
+<TGConnectingPoint num="1" id="5169" />
+<TGConnectingPoint num="2" id="5170" />
+<TGConnectingPoint num="3" id="5171" />
+<TGConnectingPoint num="4" id="5172" />
+<TGConnectingPoint num="5" id="5173" />
+<TGConnectingPoint num="6" id="5174" />
+<TGConnectingPoint num="7" id="5175" />
+<TGConnectingPoint num="8" id="5176" />
+<TGConnectingPoint num="9" id="5177" />
+<TGConnectingPoint num="10" id="5178" />
+<TGConnectingPoint num="11" id="5179" />
+<TGConnectingPoint num="12" id="5180" />
+<TGConnectingPoint num="13" id="5181" />
+<TGConnectingPoint num="14" id="5182" />
+<TGConnectingPoint num="15" id="5183" />
+<TGConnectingPoint num="16" id="5184" />
+<TGConnectingPoint num="17" id="5185" />
+<TGConnectingPoint num="18" id="5186" />
+<TGConnectingPoint num="19" id="5187" />
+<TGConnectingPoint num="20" id="5188" />
+<TGConnectingPoint num="21" id="5189" />
+<TGConnectingPoint num="22" id="5190" />
+<TGConnectingPoint num="23" id="5191" />
+<TGConnectingPoint num="24" id="5192" />
+<TGConnectingPoint num="25" id="5193" />
+<TGConnectingPoint num="26" id="5194" />
+<TGConnectingPoint num="27" id="5195" />
+<TGConnectingPoint num="28" id="5196" />
+<TGConnectingPoint num="29" id="5197" />
+<TGConnectingPoint num="30" id="5198" />
+<TGConnectingPoint num="31" id="5199" />
+<TGConnectingPoint num="32" id="5200" />
+<TGConnectingPoint num="33" id="5201" />
+<TGConnectingPoint num="34" id="5202" />
+<TGConnectingPoint num="35" id="5203" />
+<TGConnectingPoint num="36" id="5204" />
+<TGConnectingPoint num="37" id="5205" />
+<TGConnectingPoint num="38" id="5206" />
+<TGConnectingPoint num="39" id="5207" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7086" >
-<cdparam x="99" y="914" />
+<COMPONENT type="5106" id="5249" >
+<cdparam x="329" y="880" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="InvalidCert2" />
-<TGConnectingPoint num="0" id="7046" />
-<TGConnectingPoint num="1" id="7047" />
-<TGConnectingPoint num="2" id="7048" />
-<TGConnectingPoint num="3" id="7049" />
-<TGConnectingPoint num="4" id="7050" />
-<TGConnectingPoint num="5" id="7051" />
-<TGConnectingPoint num="6" id="7052" />
-<TGConnectingPoint num="7" id="7053" />
-<TGConnectingPoint num="8" id="7054" />
-<TGConnectingPoint num="9" id="7055" />
-<TGConnectingPoint num="10" id="7056" />
-<TGConnectingPoint num="11" id="7057" />
-<TGConnectingPoint num="12" id="7058" />
-<TGConnectingPoint num="13" id="7059" />
-<TGConnectingPoint num="14" id="7060" />
-<TGConnectingPoint num="15" id="7061" />
-<TGConnectingPoint num="16" id="7062" />
-<TGConnectingPoint num="17" id="7063" />
-<TGConnectingPoint num="18" id="7064" />
-<TGConnectingPoint num="19" id="7065" />
-<TGConnectingPoint num="20" id="7066" />
-<TGConnectingPoint num="21" id="7067" />
-<TGConnectingPoint num="22" id="7068" />
-<TGConnectingPoint num="23" id="7069" />
-<TGConnectingPoint num="24" id="7070" />
-<TGConnectingPoint num="25" id="7071" />
-<TGConnectingPoint num="26" id="7072" />
-<TGConnectingPoint num="27" id="7073" />
-<TGConnectingPoint num="28" id="7074" />
-<TGConnectingPoint num="29" id="7075" />
-<TGConnectingPoint num="30" id="7076" />
-<TGConnectingPoint num="31" id="7077" />
-<TGConnectingPoint num="32" id="7078" />
-<TGConnectingPoint num="33" id="7079" />
-<TGConnectingPoint num="34" id="7080" />
-<TGConnectingPoint num="35" id="7081" />
-<TGConnectingPoint num="36" id="7082" />
-<TGConnectingPoint num="37" id="7083" />
-<TGConnectingPoint num="38" id="7084" />
-<TGConnectingPoint num="39" id="7085" />
+<infoparam name="state0" value="Verifyrpk" />
+<TGConnectingPoint num="0" id="5209" />
+<TGConnectingPoint num="1" id="5210" />
+<TGConnectingPoint num="2" id="5211" />
+<TGConnectingPoint num="3" id="5212" />
+<TGConnectingPoint num="4" id="5213" />
+<TGConnectingPoint num="5" id="5214" />
+<TGConnectingPoint num="6" id="5215" />
+<TGConnectingPoint num="7" id="5216" />
+<TGConnectingPoint num="8" id="5217" />
+<TGConnectingPoint num="9" id="5218" />
+<TGConnectingPoint num="10" id="5219" />
+<TGConnectingPoint num="11" id="5220" />
+<TGConnectingPoint num="12" id="5221" />
+<TGConnectingPoint num="13" id="5222" />
+<TGConnectingPoint num="14" id="5223" />
+<TGConnectingPoint num="15" id="5224" />
+<TGConnectingPoint num="16" id="5225" />
+<TGConnectingPoint num="17" id="5226" />
+<TGConnectingPoint num="18" id="5227" />
+<TGConnectingPoint num="19" id="5228" />
+<TGConnectingPoint num="20" id="5229" />
+<TGConnectingPoint num="21" id="5230" />
+<TGConnectingPoint num="22" id="5231" />
+<TGConnectingPoint num="23" id="5232" />
+<TGConnectingPoint num="24" id="5233" />
+<TGConnectingPoint num="25" id="5234" />
+<TGConnectingPoint num="26" id="5235" />
+<TGConnectingPoint num="27" id="5236" />
+<TGConnectingPoint num="28" id="5237" />
+<TGConnectingPoint num="29" id="5238" />
+<TGConnectingPoint num="30" id="5239" />
+<TGConnectingPoint num="31" id="5240" />
+<TGConnectingPoint num="32" id="5241" />
+<TGConnectingPoint num="33" id="5242" />
+<TGConnectingPoint num="34" id="5243" />
+<TGConnectingPoint num="35" id="5244" />
+<TGConnectingPoint num="36" id="5245" />
+<TGConnectingPoint num="37" id="5246" />
+<TGConnectingPoint num="38" id="5247" />
+<TGConnectingPoint num="39" id="5248" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7127" >
-<cdparam x="198" y="809" />
+<COMPONENT type="5106" id="5290" >
+<cdparam x="149" y="877" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="VerifyCert2" />
-<TGConnectingPoint num="0" id="7087" />
-<TGConnectingPoint num="1" id="7088" />
-<TGConnectingPoint num="2" id="7089" />
-<TGConnectingPoint num="3" id="7090" />
-<TGConnectingPoint num="4" id="7091" />
-<TGConnectingPoint num="5" id="7092" />
-<TGConnectingPoint num="6" id="7093" />
-<TGConnectingPoint num="7" id="7094" />
-<TGConnectingPoint num="8" id="7095" />
-<TGConnectingPoint num="9" id="7096" />
-<TGConnectingPoint num="10" id="7097" />
-<TGConnectingPoint num="11" id="7098" />
-<TGConnectingPoint num="12" id="7099" />
-<TGConnectingPoint num="13" id="7100" />
-<TGConnectingPoint num="14" id="7101" />
-<TGConnectingPoint num="15" id="7102" />
-<TGConnectingPoint num="16" id="7103" />
-<TGConnectingPoint num="17" id="7104" />
-<TGConnectingPoint num="18" id="7105" />
-<TGConnectingPoint num="19" id="7106" />
-<TGConnectingPoint num="20" id="7107" />
-<TGConnectingPoint num="21" id="7108" />
-<TGConnectingPoint num="22" id="7109" />
-<TGConnectingPoint num="23" id="7110" />
-<TGConnectingPoint num="24" id="7111" />
-<TGConnectingPoint num="25" id="7112" />
-<TGConnectingPoint num="26" id="7113" />
-<TGConnectingPoint num="27" id="7114" />
-<TGConnectingPoint num="28" id="7115" />
-<TGConnectingPoint num="29" id="7116" />
-<TGConnectingPoint num="30" id="7117" />
-<TGConnectingPoint num="31" id="7118" />
-<TGConnectingPoint num="32" id="7119" />
-<TGConnectingPoint num="33" id="7120" />
-<TGConnectingPoint num="34" id="7121" />
-<TGConnectingPoint num="35" id="7122" />
-<TGConnectingPoint num="36" id="7123" />
-<TGConnectingPoint num="37" id="7124" />
-<TGConnectingPoint num="38" id="7125" />
-<TGConnectingPoint num="39" id="7126" />
+<infoparam name="state0" value="InvalidSig1" />
+<TGConnectingPoint num="0" id="5250" />
+<TGConnectingPoint num="1" id="5251" />
+<TGConnectingPoint num="2" id="5252" />
+<TGConnectingPoint num="3" id="5253" />
+<TGConnectingPoint num="4" id="5254" />
+<TGConnectingPoint num="5" id="5255" />
+<TGConnectingPoint num="6" id="5256" />
+<TGConnectingPoint num="7" id="5257" />
+<TGConnectingPoint num="8" id="5258" />
+<TGConnectingPoint num="9" id="5259" />
+<TGConnectingPoint num="10" id="5260" />
+<TGConnectingPoint num="11" id="5261" />
+<TGConnectingPoint num="12" id="5262" />
+<TGConnectingPoint num="13" id="5263" />
+<TGConnectingPoint num="14" id="5264" />
+<TGConnectingPoint num="15" id="5265" />
+<TGConnectingPoint num="16" id="5266" />
+<TGConnectingPoint num="17" id="5267" />
+<TGConnectingPoint num="18" id="5268" />
+<TGConnectingPoint num="19" id="5269" />
+<TGConnectingPoint num="20" id="5270" />
+<TGConnectingPoint num="21" id="5271" />
+<TGConnectingPoint num="22" id="5272" />
+<TGConnectingPoint num="23" id="5273" />
+<TGConnectingPoint num="24" id="5274" />
+<TGConnectingPoint num="25" id="5275" />
+<TGConnectingPoint num="26" id="5276" />
+<TGConnectingPoint num="27" id="5277" />
+<TGConnectingPoint num="28" id="5278" />
+<TGConnectingPoint num="29" id="5279" />
+<TGConnectingPoint num="30" id="5280" />
+<TGConnectingPoint num="31" id="5281" />
+<TGConnectingPoint num="32" id="5282" />
+<TGConnectingPoint num="33" id="5283" />
+<TGConnectingPoint num="34" id="5284" />
+<TGConnectingPoint num="35" id="5285" />
+<TGConnectingPoint num="36" id="5286" />
+<TGConnectingPoint num="37" id="5287" />
+<TGConnectingPoint num="38" id="5288" />
+<TGConnectingPoint num="39" id="5289" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7168" >
-<cdparam x="27" y="809" />
+<COMPONENT type="5106" id="5331" >
+<cdparam x="267" y="778" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Invalidts2" />
-<TGConnectingPoint num="0" id="7128" />
-<TGConnectingPoint num="1" id="7129" />
-<TGConnectingPoint num="2" id="7130" />
-<TGConnectingPoint num="3" id="7131" />
-<TGConnectingPoint num="4" id="7132" />
-<TGConnectingPoint num="5" id="7133" />
-<TGConnectingPoint num="6" id="7134" />
-<TGConnectingPoint num="7" id="7135" />
-<TGConnectingPoint num="8" id="7136" />
-<TGConnectingPoint num="9" id="7137" />
-<TGConnectingPoint num="10" id="7138" />
-<TGConnectingPoint num="11" id="7139" />
-<TGConnectingPoint num="12" id="7140" />
-<TGConnectingPoint num="13" id="7141" />
-<TGConnectingPoint num="14" id="7142" />
-<TGConnectingPoint num="15" id="7143" />
-<TGConnectingPoint num="16" id="7144" />
-<TGConnectingPoint num="17" id="7145" />
-<TGConnectingPoint num="18" id="7146" />
-<TGConnectingPoint num="19" id="7147" />
-<TGConnectingPoint num="20" id="7148" />
-<TGConnectingPoint num="21" id="7149" />
-<TGConnectingPoint num="22" id="7150" />
-<TGConnectingPoint num="23" id="7151" />
-<TGConnectingPoint num="24" id="7152" />
-<TGConnectingPoint num="25" id="7153" />
-<TGConnectingPoint num="26" id="7154" />
-<TGConnectingPoint num="27" id="7155" />
-<TGConnectingPoint num="28" id="7156" />
-<TGConnectingPoint num="29" id="7157" />
-<TGConnectingPoint num="30" id="7158" />
-<TGConnectingPoint num="31" id="7159" />
-<TGConnectingPoint num="32" id="7160" />
-<TGConnectingPoint num="33" id="7161" />
-<TGConnectingPoint num="34" id="7162" />
-<TGConnectingPoint num="35" id="7163" />
-<TGConnectingPoint num="36" id="7164" />
-<TGConnectingPoint num="37" id="7165" />
-<TGConnectingPoint num="38" id="7166" />
-<TGConnectingPoint num="39" id="7167" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="301" id="7185" >
-<cdparam x="266" y="553" />
-<sizeparam width="288" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Receive and verify m2: certified pk from ECU2
-" />
-<TGConnectingPoint num="0" id="7169" />
-<TGConnectingPoint num="1" id="7170" />
-<TGConnectingPoint num="2" id="7171" />
-<TGConnectingPoint num="3" id="7172" />
-<TGConnectingPoint num="4" id="7173" />
-<TGConnectingPoint num="5" id="7174" />
-<TGConnectingPoint num="6" id="7175" />
-<TGConnectingPoint num="7" id="7176" />
-<TGConnectingPoint num="8" id="7177" />
-<TGConnectingPoint num="9" id="7178" />
-<TGConnectingPoint num="10" id="7179" />
-<TGConnectingPoint num="11" id="7180" />
-<TGConnectingPoint num="12" id="7181" />
-<TGConnectingPoint num="13" id="7182" />
-<TGConnectingPoint num="14" id="7183" />
-<TGConnectingPoint num="15" id="7184" />
+<infoparam name="state0" value="VerifySig1" />
+<TGConnectingPoint num="0" id="5291" />
+<TGConnectingPoint num="1" id="5292" />
+<TGConnectingPoint num="2" id="5293" />
+<TGConnectingPoint num="3" id="5294" />
+<TGConnectingPoint num="4" id="5295" />
+<TGConnectingPoint num="5" id="5296" />
+<TGConnectingPoint num="6" id="5297" />
+<TGConnectingPoint num="7" id="5298" />
+<TGConnectingPoint num="8" id="5299" />
+<TGConnectingPoint num="9" id="5300" />
+<TGConnectingPoint num="10" id="5301" />
+<TGConnectingPoint num="11" id="5302" />
+<TGConnectingPoint num="12" id="5303" />
+<TGConnectingPoint num="13" id="5304" />
+<TGConnectingPoint num="14" id="5305" />
+<TGConnectingPoint num="15" id="5306" />
+<TGConnectingPoint num="16" id="5307" />
+<TGConnectingPoint num="17" id="5308" />
+<TGConnectingPoint num="18" id="5309" />
+<TGConnectingPoint num="19" id="5310" />
+<TGConnectingPoint num="20" id="5311" />
+<TGConnectingPoint num="21" id="5312" />
+<TGConnectingPoint num="22" id="5313" />
+<TGConnectingPoint num="23" id="5314" />
+<TGConnectingPoint num="24" id="5315" />
+<TGConnectingPoint num="25" id="5316" />
+<TGConnectingPoint num="26" id="5317" />
+<TGConnectingPoint num="27" id="5318" />
+<TGConnectingPoint num="28" id="5319" />
+<TGConnectingPoint num="29" id="5320" />
+<TGConnectingPoint num="30" id="5321" />
+<TGConnectingPoint num="31" id="5322" />
+<TGConnectingPoint num="32" id="5323" />
+<TGConnectingPoint num="33" id="5324" />
+<TGConnectingPoint num="34" id="5325" />
+<TGConnectingPoint num="35" id="5326" />
+<TGConnectingPoint num="36" id="5327" />
+<TGConnectingPoint num="37" id="5328" />
+<TGConnectingPoint num="38" id="5329" />
+<TGConnectingPoint num="39" id="5330" />
 <extraparam>
-<Line value="Receive and verify m2: certified pk from ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="7202" >
-<cdparam x="277" y="318" />
-<sizeparam width="356" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5372" >
+<cdparam x="63" y="778" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create request message m1 to ask for public key of ECU2
-" />
-<TGConnectingPoint num="0" id="7186" />
-<TGConnectingPoint num="1" id="7187" />
-<TGConnectingPoint num="2" id="7188" />
-<TGConnectingPoint num="3" id="7189" />
-<TGConnectingPoint num="4" id="7190" />
-<TGConnectingPoint num="5" id="7191" />
-<TGConnectingPoint num="6" id="7192" />
-<TGConnectingPoint num="7" id="7193" />
-<TGConnectingPoint num="8" id="7194" />
-<TGConnectingPoint num="9" id="7195" />
-<TGConnectingPoint num="10" id="7196" />
-<TGConnectingPoint num="11" id="7197" />
-<TGConnectingPoint num="12" id="7198" />
-<TGConnectingPoint num="13" id="7199" />
-<TGConnectingPoint num="14" id="7200" />
-<TGConnectingPoint num="15" id="7201" />
+<infoparam name="state0" value="Invalidts1" />
+<TGConnectingPoint num="0" id="5332" />
+<TGConnectingPoint num="1" id="5333" />
+<TGConnectingPoint num="2" id="5334" />
+<TGConnectingPoint num="3" id="5335" />
+<TGConnectingPoint num="4" id="5336" />
+<TGConnectingPoint num="5" id="5337" />
+<TGConnectingPoint num="6" id="5338" />
+<TGConnectingPoint num="7" id="5339" />
+<TGConnectingPoint num="8" id="5340" />
+<TGConnectingPoint num="9" id="5341" />
+<TGConnectingPoint num="10" id="5342" />
+<TGConnectingPoint num="11" id="5343" />
+<TGConnectingPoint num="12" id="5344" />
+<TGConnectingPoint num="13" id="5345" />
+<TGConnectingPoint num="14" id="5346" />
+<TGConnectingPoint num="15" id="5347" />
+<TGConnectingPoint num="16" id="5348" />
+<TGConnectingPoint num="17" id="5349" />
+<TGConnectingPoint num="18" id="5350" />
+<TGConnectingPoint num="19" id="5351" />
+<TGConnectingPoint num="20" id="5352" />
+<TGConnectingPoint num="21" id="5353" />
+<TGConnectingPoint num="22" id="5354" />
+<TGConnectingPoint num="23" id="5355" />
+<TGConnectingPoint num="24" id="5356" />
+<TGConnectingPoint num="25" id="5357" />
+<TGConnectingPoint num="26" id="5358" />
+<TGConnectingPoint num="27" id="5359" />
+<TGConnectingPoint num="28" id="5360" />
+<TGConnectingPoint num="29" id="5361" />
+<TGConnectingPoint num="30" id="5362" />
+<TGConnectingPoint num="31" id="5363" />
+<TGConnectingPoint num="32" id="5364" />
+<TGConnectingPoint num="33" id="5365" />
+<TGConnectingPoint num="34" id="5366" />
+<TGConnectingPoint num="35" id="5367" />
+<TGConnectingPoint num="36" id="5368" />
+<TGConnectingPoint num="37" id="5369" />
+<TGConnectingPoint num="38" id="5370" />
+<TGConnectingPoint num="39" id="5371" />
 <extraparam>
-<Line value="Create request message m1 to ask for public key of ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="301" id="7219" >
-<cdparam x="278" y="59" />
-<sizeparam width="308" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5413" >
+<cdparam x="277" y="384" />
+<sizeparam width="102" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="UML Note" value="Create m0: Send own certified public key to ECU2
-" />
-<TGConnectingPoint num="0" id="7203" />
-<TGConnectingPoint num="1" id="7204" />
-<TGConnectingPoint num="2" id="7205" />
-<TGConnectingPoint num="3" id="7206" />
-<TGConnectingPoint num="4" id="7207" />
-<TGConnectingPoint num="5" id="7208" />
-<TGConnectingPoint num="6" id="7209" />
-<TGConnectingPoint num="7" id="7210" />
-<TGConnectingPoint num="8" id="7211" />
-<TGConnectingPoint num="9" id="7212" />
-<TGConnectingPoint num="10" id="7213" />
-<TGConnectingPoint num="11" id="7214" />
-<TGConnectingPoint num="12" id="7215" />
-<TGConnectingPoint num="13" id="7216" />
-<TGConnectingPoint num="14" id="7217" />
-<TGConnectingPoint num="15" id="7218" />
+<infoparam name="state1" value="ValidCert0" />
+<TGConnectingPoint num="0" id="5373" />
+<TGConnectingPoint num="1" id="5374" />
+<TGConnectingPoint num="2" id="5375" />
+<TGConnectingPoint num="3" id="5376" />
+<TGConnectingPoint num="4" id="5377" />
+<TGConnectingPoint num="5" id="5378" />
+<TGConnectingPoint num="6" id="5379" />
+<TGConnectingPoint num="7" id="5380" />
+<TGConnectingPoint num="8" id="5381" />
+<TGConnectingPoint num="9" id="5382" />
+<TGConnectingPoint num="10" id="5383" />
+<TGConnectingPoint num="11" id="5384" />
+<TGConnectingPoint num="12" id="5385" />
+<TGConnectingPoint num="13" id="5386" />
+<TGConnectingPoint num="14" id="5387" />
+<TGConnectingPoint num="15" id="5388" />
+<TGConnectingPoint num="16" id="5389" />
+<TGConnectingPoint num="17" id="5390" />
+<TGConnectingPoint num="18" id="5391" />
+<TGConnectingPoint num="19" id="5392" />
+<TGConnectingPoint num="20" id="5393" />
+<TGConnectingPoint num="21" id="5394" />
+<TGConnectingPoint num="22" id="5395" />
+<TGConnectingPoint num="23" id="5396" />
+<TGConnectingPoint num="24" id="5397" />
+<TGConnectingPoint num="25" id="5398" />
+<TGConnectingPoint num="26" id="5399" />
+<TGConnectingPoint num="27" id="5400" />
+<TGConnectingPoint num="28" id="5401" />
+<TGConnectingPoint num="29" id="5402" />
+<TGConnectingPoint num="30" id="5403" />
+<TGConnectingPoint num="31" id="5404" />
+<TGConnectingPoint num="32" id="5405" />
+<TGConnectingPoint num="33" id="5406" />
+<TGConnectingPoint num="34" id="5407" />
+<TGConnectingPoint num="35" id="5408" />
+<TGConnectingPoint num="36" id="5409" />
+<TGConnectingPoint num="37" id="5410" />
+<TGConnectingPoint num="38" id="5411" />
+<TGConnectingPoint num="39" id="5412" />
 <extraparam>
-<Line value="Create m0: Send own certified public key to ECU2" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7260" >
-<cdparam x="112" y="699" />
+<COMPONENT type="5106" id="5454" >
+<cdparam x="189" y="687" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="Testts2" />
-<TGConnectingPoint num="0" id="7220" />
-<TGConnectingPoint num="1" id="7221" />
-<TGConnectingPoint num="2" id="7222" />
-<TGConnectingPoint num="3" id="7223" />
-<TGConnectingPoint num="4" id="7224" />
-<TGConnectingPoint num="5" id="7225" />
-<TGConnectingPoint num="6" id="7226" />
-<TGConnectingPoint num="7" id="7227" />
-<TGConnectingPoint num="8" id="7228" />
-<TGConnectingPoint num="9" id="7229" />
-<TGConnectingPoint num="10" id="7230" />
-<TGConnectingPoint num="11" id="7231" />
-<TGConnectingPoint num="12" id="7232" />
-<TGConnectingPoint num="13" id="7233" />
-<TGConnectingPoint num="14" id="7234" />
-<TGConnectingPoint num="15" id="7235" />
-<TGConnectingPoint num="16" id="7236" />
-<TGConnectingPoint num="17" id="7237" />
-<TGConnectingPoint num="18" id="7238" />
-<TGConnectingPoint num="19" id="7239" />
-<TGConnectingPoint num="20" id="7240" />
-<TGConnectingPoint num="21" id="7241" />
-<TGConnectingPoint num="22" id="7242" />
-<TGConnectingPoint num="23" id="7243" />
-<TGConnectingPoint num="24" id="7244" />
-<TGConnectingPoint num="25" id="7245" />
-<TGConnectingPoint num="26" id="7246" />
-<TGConnectingPoint num="27" id="7247" />
-<TGConnectingPoint num="28" id="7248" />
-<TGConnectingPoint num="29" id="7249" />
-<TGConnectingPoint num="30" id="7250" />
-<TGConnectingPoint num="31" id="7251" />
-<TGConnectingPoint num="32" id="7252" />
-<TGConnectingPoint num="33" id="7253" />
-<TGConnectingPoint num="34" id="7254" />
-<TGConnectingPoint num="35" id="7255" />
-<TGConnectingPoint num="36" id="7256" />
-<TGConnectingPoint num="37" id="7257" />
-<TGConnectingPoint num="38" id="7258" />
-<TGConnectingPoint num="39" id="7259" />
+<infoparam name="state1" value="Testts1" />
+<TGConnectingPoint num="0" id="5414" />
+<TGConnectingPoint num="1" id="5415" />
+<TGConnectingPoint num="2" id="5416" />
+<TGConnectingPoint num="3" id="5417" />
+<TGConnectingPoint num="4" id="5418" />
+<TGConnectingPoint num="5" id="5419" />
+<TGConnectingPoint num="6" id="5420" />
+<TGConnectingPoint num="7" id="5421" />
+<TGConnectingPoint num="8" id="5422" />
+<TGConnectingPoint num="9" id="5423" />
+<TGConnectingPoint num="10" id="5424" />
+<TGConnectingPoint num="11" id="5425" />
+<TGConnectingPoint num="12" id="5426" />
+<TGConnectingPoint num="13" id="5427" />
+<TGConnectingPoint num="14" id="5428" />
+<TGConnectingPoint num="15" id="5429" />
+<TGConnectingPoint num="16" id="5430" />
+<TGConnectingPoint num="17" id="5431" />
+<TGConnectingPoint num="18" id="5432" />
+<TGConnectingPoint num="19" id="5433" />
+<TGConnectingPoint num="20" id="5434" />
+<TGConnectingPoint num="21" id="5435" />
+<TGConnectingPoint num="22" id="5436" />
+<TGConnectingPoint num="23" id="5437" />
+<TGConnectingPoint num="24" id="5438" />
+<TGConnectingPoint num="25" id="5439" />
+<TGConnectingPoint num="26" id="5440" />
+<TGConnectingPoint num="27" id="5441" />
+<TGConnectingPoint num="28" id="5442" />
+<TGConnectingPoint num="29" id="5443" />
+<TGConnectingPoint num="30" id="5444" />
+<TGConnectingPoint num="31" id="5445" />
+<TGConnectingPoint num="32" id="5446" />
+<TGConnectingPoint num="33" id="5447" />
+<TGConnectingPoint num="34" id="5448" />
+<TGConnectingPoint num="35" id="5449" />
+<TGConnectingPoint num="36" id="5450" />
+<TGConnectingPoint num="37" id="5451" />
+<TGConnectingPoint num="38" id="5452" />
+<TGConnectingPoint num="39" id="5453" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="7271" >
-<cdparam x="49" y="621" />
+<COMPONENT type="5104" id="5465" >
+<cdparam x="216" y="629" />
 <sizeparam width="68" 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="2900" />
-<infoparam name="Receive signal" value="chin(m2)" />
-<TGConnectingPoint num="0" id="7261" />
-<TGConnectingPoint num="1" id="7262" />
-<TGConnectingPoint num="2" id="7263" />
-<TGConnectingPoint num="3" id="7264" />
-<TGConnectingPoint num="4" id="7265" />
-<TGConnectingPoint num="5" id="7266" />
-<TGConnectingPoint num="6" id="7267" />
-<TGConnectingPoint num="7" id="7268" />
-<TGConnectingPoint num="8" id="7269" />
-<TGConnectingPoint num="9" id="7270" />
+<infoparam name="Receive signal" value="chin(m1)" />
+<TGConnectingPoint num="0" id="5455" />
+<TGConnectingPoint num="1" id="5456" />
+<TGConnectingPoint num="2" id="5457" />
+<TGConnectingPoint num="3" id="5458" />
+<TGConnectingPoint num="4" id="5459" />
+<TGConnectingPoint num="5" id="5460" />
+<TGConnectingPoint num="6" id="5461" />
+<TGConnectingPoint num="7" id="5462" />
+<TGConnectingPoint num="8" id="5463" />
+<TGConnectingPoint num="9" id="5464" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="7312" >
-<cdparam x="27" y="550" />
+<COMPONENT type="5106" id="5506" >
+<cdparam x="242" y="559" />
+<sizeparam width="118" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state1" value="WaitForMsg1" />
+<TGConnectingPoint num="0" id="5466" />
+<TGConnectingPoint num="1" id="5467" />
+<TGConnectingPoint num="2" id="5468" />
+<TGConnectingPoint num="3" id="5469" />
+<TGConnectingPoint num="4" id="5470" />
+<TGConnectingPoint num="5" id="5471" />
+<TGConnectingPoint num="6" id="5472" />
+<TGConnectingPoint num="7" id="5473" />
+<TGConnectingPoint num="8" id="5474" />
+<TGConnectingPoint num="9" id="5475" />
+<TGConnectingPoint num="10" id="5476" />
+<TGConnectingPoint num="11" id="5477" />
+<TGConnectingPoint num="12" id="5478" />
+<TGConnectingPoint num="13" id="5479" />
+<TGConnectingPoint num="14" id="5480" />
+<TGConnectingPoint num="15" id="5481" />
+<TGConnectingPoint num="16" id="5482" />
+<TGConnectingPoint num="17" id="5483" />
+<TGConnectingPoint num="18" id="5484" />
+<TGConnectingPoint num="19" id="5485" />
+<TGConnectingPoint num="20" id="5486" />
+<TGConnectingPoint num="21" id="5487" />
+<TGConnectingPoint num="22" id="5488" />
+<TGConnectingPoint num="23" id="5489" />
+<TGConnectingPoint num="24" id="5490" />
+<TGConnectingPoint num="25" id="5491" />
+<TGConnectingPoint num="26" id="5492" />
+<TGConnectingPoint num="27" id="5493" />
+<TGConnectingPoint num="28" id="5494" />
+<TGConnectingPoint num="29" id="5495" />
+<TGConnectingPoint num="30" id="5496" />
+<TGConnectingPoint num="31" id="5497" />
+<TGConnectingPoint num="32" id="5498" />
+<TGConnectingPoint num="33" id="5499" />
+<TGConnectingPoint num="34" id="5500" />
+<TGConnectingPoint num="35" id="5501" />
+<TGConnectingPoint num="36" id="5502" />
+<TGConnectingPoint num="37" id="5503" />
+<TGConnectingPoint num="38" id="5504" />
+<TGConnectingPoint num="39" id="5505" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="5547" >
+<cdparam x="18" y="560" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="WaitForMsg2" />
-<TGConnectingPoint num="0" id="7272" />
-<TGConnectingPoint num="1" id="7273" />
-<TGConnectingPoint num="2" id="7274" />
-<TGConnectingPoint num="3" id="7275" />
-<TGConnectingPoint num="4" id="7276" />
-<TGConnectingPoint num="5" id="7277" />
-<TGConnectingPoint num="6" id="7278" />
-<TGConnectingPoint num="7" id="7279" />
-<TGConnectingPoint num="8" id="7280" />
-<TGConnectingPoint num="9" id="7281" />
-<TGConnectingPoint num="10" id="7282" />
-<TGConnectingPoint num="11" id="7283" />
-<TGConnectingPoint num="12" id="7284" />
-<TGConnectingPoint num="13" id="7285" />
-<TGConnectingPoint num="14" id="7286" />
-<TGConnectingPoint num="15" id="7287" />
-<TGConnectingPoint num="16" id="7288" />
-<TGConnectingPoint num="17" id="7289" />
-<TGConnectingPoint num="18" id="7290" />
-<TGConnectingPoint num="19" id="7291" />
-<TGConnectingPoint num="20" id="7292" />
-<TGConnectingPoint num="21" id="7293" />
-<TGConnectingPoint num="22" id="7294" />
-<TGConnectingPoint num="23" id="7295" />
-<TGConnectingPoint num="24" id="7296" />
-<TGConnectingPoint num="25" id="7297" />
-<TGConnectingPoint num="26" id="7298" />
-<TGConnectingPoint num="27" id="7299" />
-<TGConnectingPoint num="28" id="7300" />
-<TGConnectingPoint num="29" id="7301" />
-<TGConnectingPoint num="30" id="7302" />
-<TGConnectingPoint num="31" id="7303" />
-<TGConnectingPoint num="32" id="7304" />
-<TGConnectingPoint num="33" id="7305" />
-<TGConnectingPoint num="34" id="7306" />
-<TGConnectingPoint num="35" id="7307" />
-<TGConnectingPoint num="36" id="7308" />
-<TGConnectingPoint num="37" id="7309" />
-<TGConnectingPoint num="38" id="7310" />
-<TGConnectingPoint num="39" id="7311" />
+<infoparam name="state0" value="InvalidSig0" />
+<TGConnectingPoint num="0" id="5507" />
+<TGConnectingPoint num="1" id="5508" />
+<TGConnectingPoint num="2" id="5509" />
+<TGConnectingPoint num="3" id="5510" />
+<TGConnectingPoint num="4" id="5511" />
+<TGConnectingPoint num="5" id="5512" />
+<TGConnectingPoint num="6" id="5513" />
+<TGConnectingPoint num="7" id="5514" />
+<TGConnectingPoint num="8" id="5515" />
+<TGConnectingPoint num="9" id="5516" />
+<TGConnectingPoint num="10" id="5517" />
+<TGConnectingPoint num="11" id="5518" />
+<TGConnectingPoint num="12" id="5519" />
+<TGConnectingPoint num="13" id="5520" />
+<TGConnectingPoint num="14" id="5521" />
+<TGConnectingPoint num="15" id="5522" />
+<TGConnectingPoint num="16" id="5523" />
+<TGConnectingPoint num="17" id="5524" />
+<TGConnectingPoint num="18" id="5525" />
+<TGConnectingPoint num="19" id="5526" />
+<TGConnectingPoint num="20" id="5527" />
+<TGConnectingPoint num="21" id="5528" />
+<TGConnectingPoint num="22" id="5529" />
+<TGConnectingPoint num="23" id="5530" />
+<TGConnectingPoint num="24" id="5531" />
+<TGConnectingPoint num="25" id="5532" />
+<TGConnectingPoint num="26" id="5533" />
+<TGConnectingPoint num="27" id="5534" />
+<TGConnectingPoint num="28" id="5535" />
+<TGConnectingPoint num="29" id="5536" />
+<TGConnectingPoint num="30" id="5537" />
+<TGConnectingPoint num="31" id="5538" />
+<TGConnectingPoint num="32" id="5539" />
+<TGConnectingPoint num="33" id="5540" />
+<TGConnectingPoint num="34" id="5541" />
+<TGConnectingPoint num="35" id="5542" />
+<TGConnectingPoint num="36" id="5543" />
+<TGConnectingPoint num="37" id="5544" />
+<TGConnectingPoint num="38" id="5545" />
+<TGConnectingPoint num="39" id="5546" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="7323" >
-<cdparam x="57" y="508" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5588" >
+<cdparam x="240" y="479" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m1)" />
-<TGConnectingPoint num="0" id="7313" />
-<TGConnectingPoint num="1" id="7314" />
-<TGConnectingPoint num="2" id="7315" />
-<TGConnectingPoint num="3" id="7316" />
-<TGConnectingPoint num="4" id="7317" />
-<TGConnectingPoint num="5" id="7318" />
-<TGConnectingPoint num="6" id="7319" />
-<TGConnectingPoint num="7" id="7320" />
-<TGConnectingPoint num="8" id="7321" />
-<TGConnectingPoint num="9" id="7322" />
+<infoparam name="state1" value="VerifySig0" />
+<TGConnectingPoint num="0" id="5548" />
+<TGConnectingPoint num="1" id="5549" />
+<TGConnectingPoint num="2" id="5550" />
+<TGConnectingPoint num="3" id="5551" />
+<TGConnectingPoint num="4" id="5552" />
+<TGConnectingPoint num="5" id="5553" />
+<TGConnectingPoint num="6" id="5554" />
+<TGConnectingPoint num="7" id="5555" />
+<TGConnectingPoint num="8" id="5556" />
+<TGConnectingPoint num="9" id="5557" />
+<TGConnectingPoint num="10" id="5558" />
+<TGConnectingPoint num="11" id="5559" />
+<TGConnectingPoint num="12" id="5560" />
+<TGConnectingPoint num="13" id="5561" />
+<TGConnectingPoint num="14" id="5562" />
+<TGConnectingPoint num="15" id="5563" />
+<TGConnectingPoint num="16" id="5564" />
+<TGConnectingPoint num="17" id="5565" />
+<TGConnectingPoint num="18" id="5566" />
+<TGConnectingPoint num="19" id="5567" />
+<TGConnectingPoint num="20" id="5568" />
+<TGConnectingPoint num="21" id="5569" />
+<TGConnectingPoint num="22" id="5570" />
+<TGConnectingPoint num="23" id="5571" />
+<TGConnectingPoint num="24" id="5572" />
+<TGConnectingPoint num="25" id="5573" />
+<TGConnectingPoint num="26" id="5574" />
+<TGConnectingPoint num="27" id="5575" />
+<TGConnectingPoint num="28" id="5576" />
+<TGConnectingPoint num="29" id="5577" />
+<TGConnectingPoint num="30" id="5578" />
+<TGConnectingPoint num="31" id="5579" />
+<TGConnectingPoint num="32" id="5580" />
+<TGConnectingPoint num="33" id="5581" />
+<TGConnectingPoint num="34" id="5582" />
+<TGConnectingPoint num="35" id="5583" />
+<TGConnectingPoint num="36" id="5584" />
+<TGConnectingPoint num="37" id="5585" />
+<TGConnectingPoint num="38" id="5586" />
+<TGConnectingPoint num="39" id="5587" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7364" >
-<cdparam x="35" y="436" />
+<COMPONENT type="5106" id="5629" >
+<cdparam x="122" y="395" />
 <sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg1" />
-<TGConnectingPoint num="0" id="7324" />
-<TGConnectingPoint num="1" id="7325" />
-<TGConnectingPoint num="2" id="7326" />
-<TGConnectingPoint num="3" id="7327" />
-<TGConnectingPoint num="4" id="7328" />
-<TGConnectingPoint num="5" id="7329" />
-<TGConnectingPoint num="6" id="7330" />
-<TGConnectingPoint num="7" id="7331" />
-<TGConnectingPoint num="8" id="7332" />
-<TGConnectingPoint num="9" id="7333" />
-<TGConnectingPoint num="10" id="7334" />
-<TGConnectingPoint num="11" id="7335" />
-<TGConnectingPoint num="12" id="7336" />
-<TGConnectingPoint num="13" id="7337" />
-<TGConnectingPoint num="14" id="7338" />
-<TGConnectingPoint num="15" id="7339" />
-<TGConnectingPoint num="16" id="7340" />
-<TGConnectingPoint num="17" id="7341" />
-<TGConnectingPoint num="18" id="7342" />
-<TGConnectingPoint num="19" id="7343" />
-<TGConnectingPoint num="20" id="7344" />
-<TGConnectingPoint num="21" id="7345" />
-<TGConnectingPoint num="22" id="7346" />
-<TGConnectingPoint num="23" id="7347" />
-<TGConnectingPoint num="24" id="7348" />
-<TGConnectingPoint num="25" id="7349" />
-<TGConnectingPoint num="26" id="7350" />
-<TGConnectingPoint num="27" id="7351" />
-<TGConnectingPoint num="28" id="7352" />
-<TGConnectingPoint num="29" id="7353" />
-<TGConnectingPoint num="30" id="7354" />
-<TGConnectingPoint num="31" id="7355" />
-<TGConnectingPoint num="32" id="7356" />
-<TGConnectingPoint num="33" id="7357" />
-<TGConnectingPoint num="34" id="7358" />
-<TGConnectingPoint num="35" id="7359" />
-<TGConnectingPoint num="36" id="7360" />
-<TGConnectingPoint num="37" id="7361" />
-<TGConnectingPoint num="38" id="7362" />
-<TGConnectingPoint num="39" id="7363" />
+<infoparam name="state0" value="InvalidCert0" />
+<TGConnectingPoint num="0" id="5589" />
+<TGConnectingPoint num="1" id="5590" />
+<TGConnectingPoint num="2" id="5591" />
+<TGConnectingPoint num="3" id="5592" />
+<TGConnectingPoint num="4" id="5593" />
+<TGConnectingPoint num="5" id="5594" />
+<TGConnectingPoint num="6" id="5595" />
+<TGConnectingPoint num="7" id="5596" />
+<TGConnectingPoint num="8" id="5597" />
+<TGConnectingPoint num="9" id="5598" />
+<TGConnectingPoint num="10" id="5599" />
+<TGConnectingPoint num="11" id="5600" />
+<TGConnectingPoint num="12" id="5601" />
+<TGConnectingPoint num="13" id="5602" />
+<TGConnectingPoint num="14" id="5603" />
+<TGConnectingPoint num="15" id="5604" />
+<TGConnectingPoint num="16" id="5605" />
+<TGConnectingPoint num="17" id="5606" />
+<TGConnectingPoint num="18" id="5607" />
+<TGConnectingPoint num="19" id="5608" />
+<TGConnectingPoint num="20" id="5609" />
+<TGConnectingPoint num="21" id="5610" />
+<TGConnectingPoint num="22" id="5611" />
+<TGConnectingPoint num="23" id="5612" />
+<TGConnectingPoint num="24" id="5613" />
+<TGConnectingPoint num="25" id="5614" />
+<TGConnectingPoint num="26" id="5615" />
+<TGConnectingPoint num="27" id="5616" />
+<TGConnectingPoint num="28" id="5617" />
+<TGConnectingPoint num="29" id="5618" />
+<TGConnectingPoint num="30" id="5619" />
+<TGConnectingPoint num="31" id="5620" />
+<TGConnectingPoint num="32" id="5621" />
+<TGConnectingPoint num="33" id="5622" />
+<TGConnectingPoint num="34" id="5623" />
+<TGConnectingPoint num="35" id="5624" />
+<TGConnectingPoint num="36" id="5625" />
+<TGConnectingPoint num="37" id="5626" />
+<TGConnectingPoint num="38" id="5627" />
+<TGConnectingPoint num="39" id="5628" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="7375" >
-<cdparam x="103" y="277" />
-<sizeparam width="68" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5670" >
+<cdparam x="228" y="288" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="Send signal" value="chout(m0)" />
-<TGConnectingPoint num="0" id="7365" />
-<TGConnectingPoint num="1" id="7366" />
-<TGConnectingPoint num="2" id="7367" />
-<TGConnectingPoint num="3" id="7368" />
-<TGConnectingPoint num="4" id="7369" />
-<TGConnectingPoint num="5" id="7370" />
-<TGConnectingPoint num="6" id="7371" />
-<TGConnectingPoint num="7" id="7372" />
-<TGConnectingPoint num="8" id="7373" />
-<TGConnectingPoint num="9" id="7374" />
+<infoparam name="state1" value="VerifyCert0" />
+<TGConnectingPoint num="0" id="5630" />
+<TGConnectingPoint num="1" id="5631" />
+<TGConnectingPoint num="2" id="5632" />
+<TGConnectingPoint num="3" id="5633" />
+<TGConnectingPoint num="4" id="5634" />
+<TGConnectingPoint num="5" id="5635" />
+<TGConnectingPoint num="6" id="5636" />
+<TGConnectingPoint num="7" id="5637" />
+<TGConnectingPoint num="8" id="5638" />
+<TGConnectingPoint num="9" id="5639" />
+<TGConnectingPoint num="10" id="5640" />
+<TGConnectingPoint num="11" id="5641" />
+<TGConnectingPoint num="12" id="5642" />
+<TGConnectingPoint num="13" id="5643" />
+<TGConnectingPoint num="14" id="5644" />
+<TGConnectingPoint num="15" id="5645" />
+<TGConnectingPoint num="16" id="5646" />
+<TGConnectingPoint num="17" id="5647" />
+<TGConnectingPoint num="18" id="5648" />
+<TGConnectingPoint num="19" id="5649" />
+<TGConnectingPoint num="20" id="5650" />
+<TGConnectingPoint num="21" id="5651" />
+<TGConnectingPoint num="22" id="5652" />
+<TGConnectingPoint num="23" id="5653" />
+<TGConnectingPoint num="24" id="5654" />
+<TGConnectingPoint num="25" id="5655" />
+<TGConnectingPoint num="26" id="5656" />
+<TGConnectingPoint num="27" id="5657" />
+<TGConnectingPoint num="28" id="5658" />
+<TGConnectingPoint num="29" id="5659" />
+<TGConnectingPoint num="30" id="5660" />
+<TGConnectingPoint num="31" id="5661" />
+<TGConnectingPoint num="32" id="5662" />
+<TGConnectingPoint num="33" id="5663" />
+<TGConnectingPoint num="34" id="5664" />
+<TGConnectingPoint num="35" id="5665" />
+<TGConnectingPoint num="36" id="5666" />
+<TGConnectingPoint num="37" id="5667" />
+<TGConnectingPoint num="38" id="5668" />
+<TGConnectingPoint num="39" id="5669" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7416" >
-<cdparam x="64" y="321" />
-<sizeparam width="90" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5711" >
+<cdparam x="33" y="314" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="ForgeMsg1" />
-<TGConnectingPoint num="0" id="7376" />
-<TGConnectingPoint num="1" id="7377" />
-<TGConnectingPoint num="2" id="7378" />
-<TGConnectingPoint num="3" id="7379" />
-<TGConnectingPoint num="4" id="7380" />
-<TGConnectingPoint num="5" id="7381" />
-<TGConnectingPoint num="6" id="7382" />
-<TGConnectingPoint num="7" id="7383" />
-<TGConnectingPoint num="8" id="7384" />
-<TGConnectingPoint num="9" id="7385" />
-<TGConnectingPoint num="10" id="7386" />
-<TGConnectingPoint num="11" id="7387" />
-<TGConnectingPoint num="12" id="7388" />
-<TGConnectingPoint num="13" id="7389" />
-<TGConnectingPoint num="14" id="7390" />
-<TGConnectingPoint num="15" id="7391" />
-<TGConnectingPoint num="16" id="7392" />
-<TGConnectingPoint num="17" id="7393" />
-<TGConnectingPoint num="18" id="7394" />
-<TGConnectingPoint num="19" id="7395" />
-<TGConnectingPoint num="20" id="7396" />
-<TGConnectingPoint num="21" id="7397" />
-<TGConnectingPoint num="22" id="7398" />
-<TGConnectingPoint num="23" id="7399" />
-<TGConnectingPoint num="24" id="7400" />
-<TGConnectingPoint num="25" id="7401" />
-<TGConnectingPoint num="26" id="7402" />
-<TGConnectingPoint num="27" id="7403" />
-<TGConnectingPoint num="28" id="7404" />
-<TGConnectingPoint num="29" id="7405" />
-<TGConnectingPoint num="30" id="7406" />
-<TGConnectingPoint num="31" id="7407" />
-<TGConnectingPoint num="32" id="7408" />
-<TGConnectingPoint num="33" id="7409" />
-<TGConnectingPoint num="34" id="7410" />
-<TGConnectingPoint num="35" id="7411" />
-<TGConnectingPoint num="36" id="7412" />
-<TGConnectingPoint num="37" id="7413" />
-<TGConnectingPoint num="38" id="7414" />
-<TGConnectingPoint num="39" id="7415" />
+<infoparam name="state0" value="Invalidts0" />
+<TGConnectingPoint num="0" id="5671" />
+<TGConnectingPoint num="1" id="5672" />
+<TGConnectingPoint num="2" id="5673" />
+<TGConnectingPoint num="3" id="5674" />
+<TGConnectingPoint num="4" id="5675" />
+<TGConnectingPoint num="5" id="5676" />
+<TGConnectingPoint num="6" id="5677" />
+<TGConnectingPoint num="7" id="5678" />
+<TGConnectingPoint num="8" id="5679" />
+<TGConnectingPoint num="9" id="5680" />
+<TGConnectingPoint num="10" id="5681" />
+<TGConnectingPoint num="11" id="5682" />
+<TGConnectingPoint num="12" id="5683" />
+<TGConnectingPoint num="13" id="5684" />
+<TGConnectingPoint num="14" id="5685" />
+<TGConnectingPoint num="15" id="5686" />
+<TGConnectingPoint num="16" id="5687" />
+<TGConnectingPoint num="17" id="5688" />
+<TGConnectingPoint num="18" id="5689" />
+<TGConnectingPoint num="19" id="5690" />
+<TGConnectingPoint num="20" id="5691" />
+<TGConnectingPoint num="21" id="5692" />
+<TGConnectingPoint num="22" id="5693" />
+<TGConnectingPoint num="23" id="5694" />
+<TGConnectingPoint num="24" id="5695" />
+<TGConnectingPoint num="25" id="5696" />
+<TGConnectingPoint num="26" id="5697" />
+<TGConnectingPoint num="27" id="5698" />
+<TGConnectingPoint num="28" id="5699" />
+<TGConnectingPoint num="29" id="5700" />
+<TGConnectingPoint num="30" id="5701" />
+<TGConnectingPoint num="31" id="5702" />
+<TGConnectingPoint num="32" id="5703" />
+<TGConnectingPoint num="33" id="5704" />
+<TGConnectingPoint num="34" id="5705" />
+<TGConnectingPoint num="35" id="5706" />
+<TGConnectingPoint num="36" id="5707" />
+<TGConnectingPoint num="37" id="5708" />
+<TGConnectingPoint num="38" id="5709" />
+<TGConnectingPoint num="39" id="5710" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7457" >
-<cdparam x="46" y="205" />
-<sizeparam width="114" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="5752" >
+<cdparam x="49" y="183" />
+<sizeparam width="182" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
-<infoparam name="state0" value="SendMsg0" />
-<TGConnectingPoint num="0" id="7417" />
-<TGConnectingPoint num="1" id="7418" />
-<TGConnectingPoint num="2" id="7419" />
-<TGConnectingPoint num="3" id="7420" />
-<TGConnectingPoint num="4" id="7421" />
-<TGConnectingPoint num="5" id="7422" />
-<TGConnectingPoint num="6" id="7423" />
-<TGConnectingPoint num="7" id="7424" />
-<TGConnectingPoint num="8" id="7425" />
-<TGConnectingPoint num="9" id="7426" />
-<TGConnectingPoint num="10" id="7427" />
-<TGConnectingPoint num="11" id="7428" />
-<TGConnectingPoint num="12" id="7429" />
-<TGConnectingPoint num="13" id="7430" />
-<TGConnectingPoint num="14" id="7431" />
-<TGConnectingPoint num="15" id="7432" />
-<TGConnectingPoint num="16" id="7433" />
-<TGConnectingPoint num="17" id="7434" />
-<TGConnectingPoint num="18" id="7435" />
-<TGConnectingPoint num="19" id="7436" />
-<TGConnectingPoint num="20" id="7437" />
-<TGConnectingPoint num="21" id="7438" />
-<TGConnectingPoint num="22" id="7439" />
-<TGConnectingPoint num="23" id="7440" />
-<TGConnectingPoint num="24" id="7441" />
-<TGConnectingPoint num="25" id="7442" />
-<TGConnectingPoint num="26" id="7443" />
-<TGConnectingPoint num="27" id="7444" />
-<TGConnectingPoint num="28" id="7445" />
-<TGConnectingPoint num="29" id="7446" />
-<TGConnectingPoint num="30" id="7447" />
-<TGConnectingPoint num="31" id="7448" />
-<TGConnectingPoint num="32" id="7449" />
-<TGConnectingPoint num="33" id="7450" />
-<TGConnectingPoint num="34" id="7451" />
-<TGConnectingPoint num="35" id="7452" />
-<TGConnectingPoint num="36" id="7453" />
-<TGConnectingPoint num="37" id="7454" />
-<TGConnectingPoint num="38" id="7455" />
-<TGConnectingPoint num="39" id="7456" />
+<infoparam name="state0" value="Testts0" />
+<TGConnectingPoint num="0" id="5712" />
+<TGConnectingPoint num="1" id="5713" />
+<TGConnectingPoint num="2" id="5714" />
+<TGConnectingPoint num="3" id="5715" />
+<TGConnectingPoint num="4" id="5716" />
+<TGConnectingPoint num="5" id="5717" />
+<TGConnectingPoint num="6" id="5718" />
+<TGConnectingPoint num="7" id="5719" />
+<TGConnectingPoint num="8" id="5720" />
+<TGConnectingPoint num="9" id="5721" />
+<TGConnectingPoint num="10" id="5722" />
+<TGConnectingPoint num="11" id="5723" />
+<TGConnectingPoint num="12" id="5724" />
+<TGConnectingPoint num="13" id="5725" />
+<TGConnectingPoint num="14" id="5726" />
+<TGConnectingPoint num="15" id="5727" />
+<TGConnectingPoint num="16" id="5728" />
+<TGConnectingPoint num="17" id="5729" />
+<TGConnectingPoint num="18" id="5730" />
+<TGConnectingPoint num="19" id="5731" />
+<TGConnectingPoint num="20" id="5732" />
+<TGConnectingPoint num="21" id="5733" />
+<TGConnectingPoint num="22" id="5734" />
+<TGConnectingPoint num="23" id="5735" />
+<TGConnectingPoint num="24" id="5736" />
+<TGConnectingPoint num="25" id="5737" />
+<TGConnectingPoint num="26" id="5738" />
+<TGConnectingPoint num="27" id="5739" />
+<TGConnectingPoint num="28" id="5740" />
+<TGConnectingPoint num="29" id="5741" />
+<TGConnectingPoint num="30" id="5742" />
+<TGConnectingPoint num="31" id="5743" />
+<TGConnectingPoint num="32" id="5744" />
+<TGConnectingPoint num="33" id="5745" />
+<TGConnectingPoint num="34" id="5746" />
+<TGConnectingPoint num="35" id="5747" />
+<TGConnectingPoint num="36" id="5748" />
+<TGConnectingPoint num="37" id="5749" />
+<TGConnectingPoint num="38" id="5750" />
+<TGConnectingPoint num="39" id="5751" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="7498" >
-<cdparam x="39" y="65" />
-<sizeparam width="98" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="5763" >
+<cdparam x="106" y="126" />
+<sizeparam width="68" 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="2900" />
-<infoparam name="state0" value="ForgeMsg0" />
-<TGConnectingPoint num="0" id="7458" />
-<TGConnectingPoint num="1" id="7459" />
-<TGConnectingPoint num="2" id="7460" />
-<TGConnectingPoint num="3" id="7461" />
-<TGConnectingPoint num="4" id="7462" />
-<TGConnectingPoint num="5" id="7463" />
-<TGConnectingPoint num="6" id="7464" />
-<TGConnectingPoint num="7" id="7465" />
-<TGConnectingPoint num="8" id="7466" />
-<TGConnectingPoint num="9" id="7467" />
-<TGConnectingPoint num="10" id="7468" />
-<TGConnectingPoint num="11" id="7469" />
-<TGConnectingPoint num="12" id="7470" />
-<TGConnectingPoint num="13" id="7471" />
-<TGConnectingPoint num="14" id="7472" />
-<TGConnectingPoint num="15" id="7473" />
-<TGConnectingPoint num="16" id="7474" />
-<TGConnectingPoint num="17" id="7475" />
-<TGConnectingPoint num="18" id="7476" />
-<TGConnectingPoint num="19" id="7477" />
-<TGConnectingPoint num="20" id="7478" />
-<TGConnectingPoint num="21" id="7479" />
-<TGConnectingPoint num="22" id="7480" />
-<TGConnectingPoint num="23" id="7481" />
-<TGConnectingPoint num="24" id="7482" />
-<TGConnectingPoint num="25" id="7483" />
-<TGConnectingPoint num="26" id="7484" />
-<TGConnectingPoint num="27" id="7485" />
-<TGConnectingPoint num="28" id="7486" />
-<TGConnectingPoint num="29" id="7487" />
-<TGConnectingPoint num="30" id="7488" />
-<TGConnectingPoint num="31" id="7489" />
-<TGConnectingPoint num="32" id="7490" />
-<TGConnectingPoint num="33" id="7491" />
-<TGConnectingPoint num="34" id="7492" />
-<TGConnectingPoint num="35" id="7493" />
-<TGConnectingPoint num="36" id="7494" />
-<TGConnectingPoint num="37" id="7495" />
-<TGConnectingPoint num="38" id="7496" />
-<TGConnectingPoint num="39" id="7497" />
+<infoparam name="Receive signal" value="chin(m0)" />
+<TGConnectingPoint num="0" id="5753" />
+<TGConnectingPoint num="1" id="5754" />
+<TGConnectingPoint num="2" id="5755" />
+<TGConnectingPoint num="3" id="5756" />
+<TGConnectingPoint num="4" id="5757" />
+<TGConnectingPoint num="5" id="5758" />
+<TGConnectingPoint num="6" id="5759" />
+<TGConnectingPoint num="7" id="5760" />
+<TGConnectingPoint num="8" id="5761" />
+<TGConnectingPoint num="9" id="5762" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="5804" >
+<cdparam x="50" y="58" />
+<sizeparam width="181" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="2900" />
+<infoparam name="state0" value="WaitForMsg0" />
+<TGConnectingPoint num="0" id="5764" />
+<TGConnectingPoint num="1" id="5765" />
+<TGConnectingPoint num="2" id="5766" />
+<TGConnectingPoint num="3" id="5767" />
+<TGConnectingPoint num="4" id="5768" />
+<TGConnectingPoint num="5" id="5769" />
+<TGConnectingPoint num="6" id="5770" />
+<TGConnectingPoint num="7" id="5771" />
+<TGConnectingPoint num="8" id="5772" />
+<TGConnectingPoint num="9" id="5773" />
+<TGConnectingPoint num="10" id="5774" />
+<TGConnectingPoint num="11" id="5775" />
+<TGConnectingPoint num="12" id="5776" />
+<TGConnectingPoint num="13" id="5777" />
+<TGConnectingPoint num="14" id="5778" />
+<TGConnectingPoint num="15" id="5779" />
+<TGConnectingPoint num="16" id="5780" />
+<TGConnectingPoint num="17" id="5781" />
+<TGConnectingPoint num="18" id="5782" />
+<TGConnectingPoint num="19" id="5783" />
+<TGConnectingPoint num="20" id="5784" />
+<TGConnectingPoint num="21" id="5785" />
+<TGConnectingPoint num="22" id="5786" />
+<TGConnectingPoint num="23" id="5787" />
+<TGConnectingPoint num="24" id="5788" />
+<TGConnectingPoint num="25" id="5789" />
+<TGConnectingPoint num="26" id="5790" />
+<TGConnectingPoint num="27" id="5791" />
+<TGConnectingPoint num="28" id="5792" />
+<TGConnectingPoint num="29" id="5793" />
+<TGConnectingPoint num="30" id="5794" />
+<TGConnectingPoint num="31" id="5795" />
+<TGConnectingPoint num="32" id="5796" />
+<TGConnectingPoint num="33" id="5797" />
+<TGConnectingPoint num="34" id="5798" />
+<TGConnectingPoint num="35" id="5799" />
+<TGConnectingPoint num="36" id="5800" />
+<TGConnectingPoint num="37" id="5801" />
+<TGConnectingPoint num="38" id="5802" />
+<TGConnectingPoint num="39" id="5803" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5100" id="7500" >
-<cdparam x="67" y="27" />
+<COMPONENT type="5100" id="5806" >
+<cdparam x="133" y="25" />
 <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="2900" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="7499" />
+<TGConnectingPoint num="0" id="5805" />
 </COMPONENT>
 
 
@@ -13865,6 +13307,18 @@ all subblocks
 <TGConnectingPoint num="9" id="7534" />
 <TGConnectingPoint num="10" id="7535" />
 <TGConnectingPoint num="11" id="7536" />
+<TGConnectingPoint num="12" id="108247" />
+<TGConnectingPoint num="13" id="108248" />
+<TGConnectingPoint num="14" id="108249" />
+<TGConnectingPoint num="15" id="108250" />
+<TGConnectingPoint num="16" id="108251" />
+<TGConnectingPoint num="17" id="108252" />
+<TGConnectingPoint num="18" id="108253" />
+<TGConnectingPoint num="19" id="108254" />
+<TGConnectingPoint num="20" id="108255" />
+<TGConnectingPoint num="21" id="108256" />
+<TGConnectingPoint num="22" id="108257" />
+<TGConnectingPoint num="23" id="108258" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -13889,6 +13343,18 @@ all subblocks
 <TGConnectingPoint num="9" id="7547" />
 <TGConnectingPoint num="10" id="7548" />
 <TGConnectingPoint num="11" id="7549" />
+<TGConnectingPoint num="12" id="108272" />
+<TGConnectingPoint num="13" id="108273" />
+<TGConnectingPoint num="14" id="108274" />
+<TGConnectingPoint num="15" id="108275" />
+<TGConnectingPoint num="16" id="108276" />
+<TGConnectingPoint num="17" id="108277" />
+<TGConnectingPoint num="18" id="108278" />
+<TGConnectingPoint num="19" id="108279" />
+<TGConnectingPoint num="20" id="108280" />
+<TGConnectingPoint num="21" id="108281" />
+<TGConnectingPoint num="22" id="108282" />
+<TGConnectingPoint num="23" id="108283" />
 <extraparam>
 <info description="blah blah blah" root="true" />
 </extraparam>
@@ -13945,6 +13411,18 @@ all subblocks
 <TGConnectingPoint num="9" id="7560" />
 <TGConnectingPoint num="10" id="7561" />
 <TGConnectingPoint num="11" id="7562" />
+<TGConnectingPoint num="12" id="108500" />
+<TGConnectingPoint num="13" id="108501" />
+<TGConnectingPoint num="14" id="108502" />
+<TGConnectingPoint num="15" id="108503" />
+<TGConnectingPoint num="16" id="108504" />
+<TGConnectingPoint num="17" id="108505" />
+<TGConnectingPoint num="18" id="108506" />
+<TGConnectingPoint num="19" id="108507" />
+<TGConnectingPoint num="20" id="108508" />
+<TGConnectingPoint num="21" id="108509" />
+<TGConnectingPoint num="22" id="108510" />
+<TGConnectingPoint num="23" id="108511" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -14033,6 +13511,18 @@ all subblocks
 <TGConnectingPoint num="9" id="7623" />
 <TGConnectingPoint num="10" id="7624" />
 <TGConnectingPoint num="11" id="7625" />
+<TGConnectingPoint num="12" id="108525" />
+<TGConnectingPoint num="13" id="108526" />
+<TGConnectingPoint num="14" id="108527" />
+<TGConnectingPoint num="15" id="108528" />
+<TGConnectingPoint num="16" id="108529" />
+<TGConnectingPoint num="17" id="108530" />
+<TGConnectingPoint num="18" id="108531" />
+<TGConnectingPoint num="19" id="108532" />
+<TGConnectingPoint num="20" id="108533" />
+<TGConnectingPoint num="21" id="108534" />
+<TGConnectingPoint num="22" id="108535" />
+<TGConnectingPoint num="23" id="108536" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -14089,77 +13579,100 @@ all subblocks
 <TGConnectingPoint num="19" id="7775" />
 <TGConnectingPoint num="20" id="7776" />
 <TGConnectingPoint num="21" id="7777" />
-<TGConnectingPoint num="22" id="7778" />
-<TGConnectingPoint num="23" id="7779" />
-</COMPONENT>
-<SUBCOMPONENT type="1401" id="7677" >
-<father id="7780" num="0" />
-<cdparam x="842" y="387" />
-<sizeparam width="235" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="360" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
-<TGConnectingPoint num="0" id="7665" />
-<TGConnectingPoint num="1" id="7666" />
-<TGConnectingPoint num="2" id="7667" />
-<TGConnectingPoint num="3" id="7668" />
-<TGConnectingPoint num="4" id="7669" />
-<TGConnectingPoint num="5" id="7670" />
-<TGConnectingPoint num="6" id="7671" />
-<TGConnectingPoint num="7" id="7672" />
-<TGConnectingPoint num="8" id="7673" />
-<TGConnectingPoint num="9" id="7674" />
-<TGConnectingPoint num="10" id="7675" />
-<TGConnectingPoint num="11" id="7676" />
+<TGConnectingPoint num="22" id="7778" />
+<TGConnectingPoint num="23" id="7779" />
+</COMPONENT>
+<SUBCOMPONENT type="1401" id="7755" >
+<father id="7780" num="0" />
+<cdparam x="938" y="514" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="495" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Plug_on_OBD" />
+<TGConnectingPoint num="0" id="7743" />
+<TGConnectingPoint num="1" id="7744" />
+<TGConnectingPoint num="2" id="7745" />
+<TGConnectingPoint num="3" id="7746" />
+<TGConnectingPoint num="4" id="7747" />
+<TGConnectingPoint num="5" id="7748" />
+<TGConnectingPoint num="6" id="7749" />
+<TGConnectingPoint num="7" id="7750" />
+<TGConnectingPoint num="8" id="7751" />
+<TGConnectingPoint num="9" id="7752" />
+<TGConnectingPoint num="10" id="7753" />
+<TGConnectingPoint num="11" id="7754" />
+<TGConnectingPoint num="12" id="108676" />
+<TGConnectingPoint num="13" id="108677" />
+<TGConnectingPoint num="14" id="108678" />
+<TGConnectingPoint num="15" id="108679" />
+<TGConnectingPoint num="16" id="108680" />
+<TGConnectingPoint num="17" id="108681" />
+<TGConnectingPoint num="18" id="108682" />
+<TGConnectingPoint num="19" id="108683" />
+<TGConnectingPoint num="20" id="108684" />
+<TGConnectingPoint num="21" id="108685" />
+<TGConnectingPoint num="22" id="108686" />
+<TGConnectingPoint num="23" id="108687" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="7690" >
+<SUBCOMPONENT type="1402" id="7742" >
 <father id="7780" num="1" />
-<cdparam x="501" y="292" />
-<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="716" y="522" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="0" maxX="440" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Connect_to_System_Bus" />
-<TGConnectingPoint num="0" id="7678" />
-<TGConnectingPoint num="1" id="7679" />
-<TGConnectingPoint num="2" id="7680" />
-<TGConnectingPoint num="3" id="7681" />
-<TGConnectingPoint num="4" id="7682" />
-<TGConnectingPoint num="5" id="7683" />
-<TGConnectingPoint num="6" id="7684" />
-<TGConnectingPoint num="7" id="7685" />
-<TGConnectingPoint num="8" id="7686" />
-<TGConnectingPoint num="9" id="7687" />
-<TGConnectingPoint num="10" id="7688" />
-<TGConnectingPoint num="11" id="7689" />
+<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
+<infoparam name="TGComponent" value="&lt;&lt;OR&gt;&gt;" />
+<TGConnectingPoint num="0" id="7730" />
+<TGConnectingPoint num="1" id="7731" />
+<TGConnectingPoint num="2" id="7732" />
+<TGConnectingPoint num="3" id="7733" />
+<TGConnectingPoint num="4" id="7734" />
+<TGConnectingPoint num="5" id="7735" />
+<TGConnectingPoint num="6" id="7736" />
+<TGConnectingPoint num="7" id="7737" />
+<TGConnectingPoint num="8" id="7738" />
+<TGConnectingPoint num="9" id="7739" />
+<TGConnectingPoint num="10" id="7740" />
+<TGConnectingPoint num="11" id="7741" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="7703" >
+<SUBCOMPONENT type="1401" id="7729" >
 <father id="7780" num="2" />
-<cdparam x="635" y="344" />
-<sizeparam width="198" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="508" y="446" />
+<sizeparam width="156" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="397" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
-<TGConnectingPoint num="0" id="7691" />
-<TGConnectingPoint num="1" id="7692" />
-<TGConnectingPoint num="2" id="7693" />
-<TGConnectingPoint num="3" id="7694" />
-<TGConnectingPoint num="4" id="7695" />
-<TGConnectingPoint num="5" id="7696" />
-<TGConnectingPoint num="6" id="7697" />
-<TGConnectingPoint num="7" id="7698" />
-<TGConnectingPoint num="8" id="7699" />
-<TGConnectingPoint num="9" id="7700" />
-<TGConnectingPoint num="10" id="7701" />
-<TGConnectingPoint num="11" id="7702" />
+<cdrectangleparam minX="0" maxX="439" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Bypass_internal_firewall" />
+<TGConnectingPoint num="0" id="7717" />
+<TGConnectingPoint num="1" id="7718" />
+<TGConnectingPoint num="2" id="7719" />
+<TGConnectingPoint num="3" id="7720" />
+<TGConnectingPoint num="4" id="7721" />
+<TGConnectingPoint num="5" id="7722" />
+<TGConnectingPoint num="6" id="7723" />
+<TGConnectingPoint num="7" id="7724" />
+<TGConnectingPoint num="8" id="7725" />
+<TGConnectingPoint num="9" id="7726" />
+<TGConnectingPoint num="10" id="7727" />
+<TGConnectingPoint num="11" id="7728" />
+<TGConnectingPoint num="12" id="108638" />
+<TGConnectingPoint num="13" id="108639" />
+<TGConnectingPoint num="14" id="108640" />
+<TGConnectingPoint num="15" id="108641" />
+<TGConnectingPoint num="16" id="108642" />
+<TGConnectingPoint num="17" id="108643" />
+<TGConnectingPoint num="18" id="108644" />
+<TGConnectingPoint num="19" id="108645" />
+<TGConnectingPoint num="20" id="108646" />
+<TGConnectingPoint num="21" id="108647" />
+<TGConnectingPoint num="22" id="108648" />
+<TGConnectingPoint num="23" id="108649" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -14187,73 +13700,110 @@ all subblocks
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="7729" >
+<SUBCOMPONENT type="1401" id="7703" >
 <father id="7780" num="4" />
-<cdparam x="508" y="446" />
-<sizeparam width="156" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="635" y="344" />
+<sizeparam width="198" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="439" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Bypass_internal_firewall" />
-<TGConnectingPoint num="0" id="7717" />
-<TGConnectingPoint num="1" id="7718" />
-<TGConnectingPoint num="2" id="7719" />
-<TGConnectingPoint num="3" id="7720" />
-<TGConnectingPoint num="4" id="7721" />
-<TGConnectingPoint num="5" id="7722" />
-<TGConnectingPoint num="6" id="7723" />
-<TGConnectingPoint num="7" id="7724" />
-<TGConnectingPoint num="8" id="7725" />
-<TGConnectingPoint num="9" id="7726" />
-<TGConnectingPoint num="10" id="7727" />
-<TGConnectingPoint num="11" id="7728" />
+<cdrectangleparam minX="0" maxX="397" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Listen_to_OpenDoor_messages" />
+<TGConnectingPoint num="0" id="7691" />
+<TGConnectingPoint num="1" id="7692" />
+<TGConnectingPoint num="2" id="7693" />
+<TGConnectingPoint num="3" id="7694" />
+<TGConnectingPoint num="4" id="7695" />
+<TGConnectingPoint num="5" id="7696" />
+<TGConnectingPoint num="6" id="7697" />
+<TGConnectingPoint num="7" id="7698" />
+<TGConnectingPoint num="8" id="7699" />
+<TGConnectingPoint num="9" id="7700" />
+<TGConnectingPoint num="10" id="7701" />
+<TGConnectingPoint num="11" id="7702" />
+<TGConnectingPoint num="12" id="108600" />
+<TGConnectingPoint num="13" id="108601" />
+<TGConnectingPoint num="14" id="108602" />
+<TGConnectingPoint num="15" id="108603" />
+<TGConnectingPoint num="16" id="108604" />
+<TGConnectingPoint num="17" id="108605" />
+<TGConnectingPoint num="18" id="108606" />
+<TGConnectingPoint num="19" id="108607" />
+<TGConnectingPoint num="20" id="108608" />
+<TGConnectingPoint num="21" id="108609" />
+<TGConnectingPoint num="22" id="108610" />
+<TGConnectingPoint num="23" id="108611" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="7742" >
+<SUBCOMPONENT type="1401" id="7690" >
 <father id="7780" num="5" />
-<cdparam x="716" y="522" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="501" y="292" />
+<sizeparam width="155" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="462" minY="0" maxY="526" />
-<infoparam name="TGComponent" value="&lt;&lt;OR&gt;&gt;" />
-<TGConnectingPoint num="0" id="7730" />
-<TGConnectingPoint num="1" id="7731" />
-<TGConnectingPoint num="2" id="7732" />
-<TGConnectingPoint num="3" id="7733" />
-<TGConnectingPoint num="4" id="7734" />
-<TGConnectingPoint num="5" id="7735" />
-<TGConnectingPoint num="6" id="7736" />
-<TGConnectingPoint num="7" id="7737" />
-<TGConnectingPoint num="8" id="7738" />
-<TGConnectingPoint num="9" id="7739" />
-<TGConnectingPoint num="10" id="7740" />
-<TGConnectingPoint num="11" id="7741" />
+<enabled value="true" />
+<cdrectangleparam minX="0" maxX="440" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Connect_to_System_Bus" />
+<TGConnectingPoint num="0" id="7678" />
+<TGConnectingPoint num="1" id="7679" />
+<TGConnectingPoint num="2" id="7680" />
+<TGConnectingPoint num="3" id="7681" />
+<TGConnectingPoint num="4" id="7682" />
+<TGConnectingPoint num="5" id="7683" />
+<TGConnectingPoint num="6" id="7684" />
+<TGConnectingPoint num="7" id="7685" />
+<TGConnectingPoint num="8" id="7686" />
+<TGConnectingPoint num="9" id="7687" />
+<TGConnectingPoint num="10" id="7688" />
+<TGConnectingPoint num="11" id="7689" />
+<TGConnectingPoint num="12" id="108575" />
+<TGConnectingPoint num="13" id="108576" />
+<TGConnectingPoint num="14" id="108577" />
+<TGConnectingPoint num="15" id="108578" />
+<TGConnectingPoint num="16" id="108579" />
+<TGConnectingPoint num="17" id="108580" />
+<TGConnectingPoint num="18" id="108581" />
+<TGConnectingPoint num="19" id="108582" />
+<TGConnectingPoint num="20" id="108583" />
+<TGConnectingPoint num="21" id="108584" />
+<TGConnectingPoint num="22" id="108585" />
+<TGConnectingPoint num="23" id="108586" />
 <extraparam>
-<info equation="" />
+<info description="blah blah blah" root="false" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="7755" >
+<SUBCOMPONENT type="1401" id="7677" >
 <father id="7780" num="6" />
-<cdparam x="938" y="514" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="842" y="387" />
+<sizeparam width="235" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="495" minY="0" maxY="406" />
-<infoparam name="TGComponent" value="Plug_on_OBD" />
-<TGConnectingPoint num="0" id="7743" />
-<TGConnectingPoint num="1" id="7744" />
-<TGConnectingPoint num="2" id="7745" />
-<TGConnectingPoint num="3" id="7746" />
-<TGConnectingPoint num="4" id="7747" />
-<TGConnectingPoint num="5" id="7748" />
-<TGConnectingPoint num="6" id="7749" />
-<TGConnectingPoint num="7" id="7750" />
-<TGConnectingPoint num="8" id="7751" />
-<TGConnectingPoint num="9" id="7752" />
-<TGConnectingPoint num="10" id="7753" />
-<TGConnectingPoint num="11" id="7754" />
+<cdrectangleparam minX="0" maxX="360" minY="0" maxY="406" />
+<infoparam name="TGComponent" value="Inject_or_Replay_OpenDoor_Message" />
+<TGConnectingPoint num="0" id="7665" />
+<TGConnectingPoint num="1" id="7666" />
+<TGConnectingPoint num="2" id="7667" />
+<TGConnectingPoint num="3" id="7668" />
+<TGConnectingPoint num="4" id="7669" />
+<TGConnectingPoint num="5" id="7670" />
+<TGConnectingPoint num="6" id="7671" />
+<TGConnectingPoint num="7" id="7672" />
+<TGConnectingPoint num="8" id="7673" />
+<TGConnectingPoint num="9" id="7674" />
+<TGConnectingPoint num="10" id="7675" />
+<TGConnectingPoint num="11" id="7676" />
+<TGConnectingPoint num="12" id="108550" />
+<TGConnectingPoint num="13" id="108551" />
+<TGConnectingPoint num="14" id="108552" />
+<TGConnectingPoint num="15" id="108553" />
+<TGConnectingPoint num="16" id="108554" />
+<TGConnectingPoint num="17" id="108555" />
+<TGConnectingPoint num="18" id="108556" />
+<TGConnectingPoint num="19" id="108557" />
+<TGConnectingPoint num="20" id="108558" />
+<TGConnectingPoint num="21" id="108559" />
+<TGConnectingPoint num="22" id="108560" />
+<TGConnectingPoint num="23" id="108561" />
 <extraparam>
 <info description="blah blah blah" root="false" />
 </extraparam>
@@ -14398,16 +13948,16 @@ all subblocks
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7796" >
+<SUBCOMPONENT type="1203" id="7798" >
 <father id="7807" num="0" />
-<cdparam x="777" y="193" />
+<cdparam x="711" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="7795" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="7797" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14415,16 +13965,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7798" >
+<SUBCOMPONENT type="1203" id="7796" >
 <father id="7807" num="1" />
-<cdparam x="711" y="193" />
+<cdparam x="777" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="7797" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="7795" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14451,16 +14001,16 @@ all subblocks
 <Attribute access="2" id="evts" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7809" >
+<SUBCOMPONENT type="1203" id="7811" >
 <father id="7820" num="0" />
-<cdparam x="793" y="118" />
+<cdparam x="707" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="7808" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="7810" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14468,16 +14018,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7811" >
+<SUBCOMPONENT type="1203" id="7809" >
 <father id="7820" num="1" />
-<cdparam x="707" y="118" />
+<cdparam x="793" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="7810" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="7808" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14504,16 +14054,16 @@ all subblocks
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7822" >
+<SUBCOMPONENT type="1203" id="7836" >
 <father id="7845" num="0" />
-<cdparam x="1719" y="221" />
+<cdparam x="1719" y="172" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="7821" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="7835" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14521,118 +14071,118 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7824" >
+<SUBCOMPONENT type="1203" id="7834" >
 <father id="7845" num="1" />
-<cdparam x="1719" y="267" />
+<cdparam x="1719" y="475" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="7823" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="7833" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7826" >
+<SUBCOMPONENT type="1203" id="7832" >
 <father id="7845" num="2" />
-<cdparam x="1719" y="313" />
+<cdparam x="1719" y="440" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="7825" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="7831" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7828" >
+<SUBCOMPONENT type="1203" id="7830" >
 <father id="7845" num="3" />
-<cdparam x="1719" y="355" />
+<cdparam x="1719" y="401" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="7827" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="7829" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7830" >
+<SUBCOMPONENT type="1203" id="7828" >
 <father id="7845" num="4" />
-<cdparam x="1719" y="401" />
+<cdparam x="1719" y="355" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="7829" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="7827" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7832" >
+<SUBCOMPONENT type="1203" id="7826" >
 <father id="7845" num="5" />
-<cdparam x="1719" y="440" />
+<cdparam x="1719" y="313" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="7831" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="7825" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7834" >
+<SUBCOMPONENT type="1203" id="7824" >
 <father id="7845" num="6" />
-<cdparam x="1719" y="475" />
+<cdparam x="1719" y="267" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="7833" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="7823" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7836" >
+<SUBCOMPONENT type="1203" id="7822" >
 <father id="7845" num="7" />
-<cdparam x="1719" y="172" />
+<cdparam x="1719" y="221" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="7835" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="7821" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14659,33 +14209,33 @@ all subblocks
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7847" >
+<SUBCOMPONENT type="1203" id="7861" >
 <father id="7870" num="0" />
-<cdparam x="1951" y="575" />
+<cdparam x="1894" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="7846" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="7860" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7849" >
+<SUBCOMPONENT type="1203" id="7859" >
 <father id="7870" num="1" />
-<cdparam x="2014" y="575" />
+<cdparam x="1845" y="726" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="7848" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="7858" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14693,16 +14243,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7851" >
+<SUBCOMPONENT type="1203" id="7857" >
 <father id="7870" num="2" />
-<cdparam x="2077" y="575" />
+<cdparam x="1845" y="689" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="7850" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="7856" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14710,50 +14260,50 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7853" >
+<SUBCOMPONENT type="1203" id="7855" >
 <father id="7870" num="3" />
-<cdparam x="1845" y="622" />
+<cdparam x="1845" y="657" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="7852" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="7854" />
 <extraparam>
-<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7855" >
+<SUBCOMPONENT type="1203" id="7853" >
 <father id="7870" num="4" />
-<cdparam x="1845" y="657" />
+<cdparam x="1845" y="622" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="7854" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="7852" />
 <extraparam>
-<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7857" >
+<SUBCOMPONENT type="1203" id="7851" >
 <father id="7870" num="5" />
-<cdparam x="1845" y="689" />
+<cdparam x="2077" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="7856" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="7850" />
 <extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14761,16 +14311,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7859" >
+<SUBCOMPONENT type="1203" id="7849" >
 <father id="7870" num="6" />
-<cdparam x="1845" y="726" />
+<cdparam x="2014" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="7858" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="7848" />
 <extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14778,17 +14328,17 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7861" >
+<SUBCOMPONENT type="1203" id="7847" >
 <father id="7870" num="7" />
-<cdparam x="1894" y="575" />
+<cdparam x="1951" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="7860" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="7846" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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="" />
@@ -14815,67 +14365,67 @@ all subblocks
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="7872" >
+<SUBCOMPONENT type="1203" id="7894" >
 <father id="7903" num="0" />
-<cdparam x="1951" y="481" />
+<cdparam x="1894" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="7871" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="7893" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7874" >
+<SUBCOMPONENT type="1203" id="7892" >
 <father id="7903" num="1" />
-<cdparam x="2014" y="481" />
+<cdparam x="1882" y="208" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="7873" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="7891" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7876" >
+<SUBCOMPONENT type="1203" id="7890" >
 <father id="7903" num="2" />
-<cdparam x="2077" y="481" />
+<cdparam x="1845" y="310" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="7875" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="7889" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7878" >
+<SUBCOMPONENT type="1203" id="7888" >
 <father id="7903" num="3" />
-<cdparam x="1845" y="459" />
+<cdparam x="1845" y="234" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="7877" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="7887" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14883,84 +14433,84 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7880" >
+<SUBCOMPONENT type="1203" id="7886" >
 <father id="7903" num="4" />
-<cdparam x="1845" y="389" />
+<cdparam x="1845" y="271" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="7879" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="7885" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7882" >
+<SUBCOMPONENT type="1203" id="7884" >
 <father id="7903" num="5" />
-<cdparam x="1845" y="427" />
+<cdparam x="1845" y="351" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="7881" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="7883" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7884" >
+<SUBCOMPONENT type="1203" id="7882" >
 <father id="7903" num="6" />
-<cdparam x="1845" y="351" />
+<cdparam x="1845" y="427" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="7883" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="7881" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7886" >
+<SUBCOMPONENT type="1203" id="7880" >
 <father id="7903" num="7" />
-<cdparam x="1845" y="271" />
+<cdparam x="1845" y="389" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="7885" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="7879" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7888" >
+<SUBCOMPONENT type="1203" id="7878" >
 <father id="7903" num="8" />
-<cdparam x="1845" y="234" />
+<cdparam x="1845" y="459" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="7887" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="7877" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -14968,51 +14518,51 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7890" >
+<SUBCOMPONENT type="1203" id="7876" >
 <father id="7903" num="9" />
-<cdparam x="1845" y="310" />
+<cdparam x="2077" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="7889" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="7875" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7892" >
+<SUBCOMPONENT type="1203" id="7874" >
 <father id="7903" num="10" />
-<cdparam x="1882" y="208" />
+<cdparam x="2014" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="7891" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="7873" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="7894" >
+<SUBCOMPONENT type="1203" id="7872" >
 <father id="7903" num="11" />
-<cdparam x="1894" y="481" />
+<cdparam x="1951" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="7893" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="7871" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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="" />
@@ -16469,10 +16019,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="8262" >
 <father id="8287" num="0" />
-<cdparam x="1110" y="497" />
-<sizeparam width="229" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1094" y="497" />
+<sizeparam width="245" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="-1" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-17" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSink" />
 <TGConnectingPoint num="0" id="8254" />
 <TGConnectingPoint num="1" id="8255" />
@@ -16524,10 +16074,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="8296" >
 <father id="8321" num="0" />
-<cdparam x="265" y="469" />
-<sizeparam width="244" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="246" y="469" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="-10" minY="0" maxY="66" />
+<cdrectangleparam minX="0" maxX="-29" minY="0" maxY="66" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::LoadSource" />
 <TGConnectingPoint num="0" id="8288" />
 <TGConnectingPoint num="1" id="8289" />
@@ -16577,31 +16127,12 @@ all subblocks
 <attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225"  privacy="0" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1103" id="8330" >
-<father id="8364" num="0" />
-<cdparam x="807" y="463" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="225" minY="0" maxY="55" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="8322" />
-<TGConnectingPoint num="1" id="8323" />
-<TGConnectingPoint num="2" id="8324" />
-<TGConnectingPoint num="3" id="8325" />
-<TGConnectingPoint num="4" id="8326" />
-<TGConnectingPoint num="5" id="8327" />
-<TGConnectingPoint num="6" id="8328" />
-<TGConnectingPoint num="7" id="8329" />
-<extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
-</extraparam>
-</SUBCOMPONENT>
 <SUBCOMPONENT type="1103" id="8339" >
-<father id="8364" num="1" />
+<father id="8364" num="0" />
 <cdparam x="604" y="465" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="220" minY="0" maxY="55" />
+<cdrectangleparam minX="0" maxX="202" minY="0" maxY="55" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
 <TGConnectingPoint num="0" id="8331" />
 <TGConnectingPoint num="1" id="8332" />
@@ -16615,6 +16146,25 @@ all subblocks
 <info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="8330" >
+<father id="8364" num="1" />
+<cdparam x="791" y="463" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="209" minY="0" maxY="55" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="8322" />
+<TGConnectingPoint num="1" id="8323" />
+<TGConnectingPoint num="2" id="8324" />
+<TGConnectingPoint num="3" id="8325" />
+<TGConnectingPoint num="4" id="8326" />
+<TGConnectingPoint num="5" id="8327" />
+<TGConnectingPoint num="6" id="8328" />
+<TGConnectingPoint num="7" id="8329" />
+<extraparam>
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
 
 <COMPONENT type="1106" id="8389" >
 <cdparam x="307" y="279" />
@@ -17797,16 +17347,16 @@ all subblocks
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8809" >
+<SUBCOMPONENT type="1203" id="8811" >
 <father id="8820" num="0" />
-<cdparam x="711" y="193" />
+<cdparam x="777" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel highPrioLoad" />
-<TGConnectingPoint num="0" id="8808" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="8810" />
 <extraparam>
-<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17814,16 +17364,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8811" >
+<SUBCOMPONENT type="1203" id="8809" >
 <father id="8820" num="1" />
-<cdparam x="777" y="193" />
+<cdparam x="711" y="193" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="93" minY="-13" maxY="81" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="8810" />
+<infoparam name="Primitive port" value="Channel highPrioLoad" />
+<TGConnectingPoint num="0" id="8808" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="highPrioLoad" commType="0" origin="false" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17850,16 +17400,16 @@ all subblocks
 <Attribute access="2" id="evts" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8822" >
+<SUBCOMPONENT type="1203" id="8826" >
 <father id="8835" num="0" />
-<cdparam x="737" y="28" />
+<cdparam x="793" y="118" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="8821" />
+<infoparam name="Primitive port" value="Channel lowPrioLoad" />
+<TGConnectingPoint num="0" id="8825" />
 <extraparam>
-<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17884,16 +17434,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8826" >
+<SUBCOMPONENT type="1203" id="8822" >
 <father id="8835" num="2" />
-<cdparam x="793" y="118" />
+<cdparam x="737" y="28" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="124" minY="-13" maxY="77" />
-<infoparam name="Primitive port" value="Channel lowPrioLoad" />
-<TGConnectingPoint num="0" id="8825" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="8821" />
 <extraparam>
-<Prop commName="lowPrioLoad" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="endProcessing" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17919,16 +17469,16 @@ all subblocks
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8837" >
+<SUBCOMPONENT type="1203" id="8841" >
 <father id="8850" num="0" />
-<cdparam x="652" y="38" />
+<cdparam x="573" y="65" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event endProcessing" />
-<TGConnectingPoint num="0" id="8836" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="8840" />
 <extraparam>
-<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17953,16 +17503,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8841" >
+<SUBCOMPONENT type="1203" id="8837" >
 <father id="8850" num="2" />
-<cdparam x="573" y="65" />
+<cdparam x="652" y="38" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="271" minY="-13" maxY="46" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="8840" />
+<infoparam name="Primitive port" value="Event endProcessing" />
+<TGConnectingPoint num="0" id="8836" />
 <extraparam>
-<Prop commName="done" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="endProcessing" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -17989,16 +17539,16 @@ all subblocks
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8852" >
+<SUBCOMPONENT type="1203" id="8866" >
 <father id="8875" num="0" />
-<cdparam x="249" y="77" />
+<cdparam x="249" y="380" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="8851" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="8865" />
 <extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18006,16 +17556,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8854" >
+<SUBCOMPONENT type="1203" id="8864" >
 <father id="8875" num="1" />
-<cdparam x="249" y="126" />
+<cdparam x="249" y="345" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="8853" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="8863" />
 <extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18023,33 +17573,33 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8856" >
+<SUBCOMPONENT type="1203" id="8862" >
 <father id="8875" num="2" />
-<cdparam x="249" y="172" />
+<cdparam x="249" y="306" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="8855" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="8861" />
 <extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8858" >
+<SUBCOMPONENT type="1203" id="8860" >
 <father id="8875" num="3" />
-<cdparam x="249" y="218" />
+<cdparam x="249" y="260" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="8857" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="8859" />
 <extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18057,16 +17607,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8860" >
+<SUBCOMPONENT type="1203" id="8858" >
 <father id="8875" num="4" />
-<cdparam x="249" y="260" />
+<cdparam x="249" y="218" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="8859" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="8857" />
 <extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="inHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18074,33 +17624,33 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8862" >
+<SUBCOMPONENT type="1203" id="8856" >
 <father id="8875" num="5" />
-<cdparam x="249" y="306" />
+<cdparam x="249" y="172" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="8861" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="8855" />
 <extraparam>
-<Prop commName="encryptECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8864" >
+<SUBCOMPONENT type="1203" id="8854" >
 <father id="8875" num="6" />
-<cdparam x="249" y="345" />
+<cdparam x="249" y="126" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="8863" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="8853" />
 <extraparam>
-<Prop commName="macECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18108,16 +17658,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8866" >
+<SUBCOMPONENT type="1203" id="8852" >
 <father id="8875" num="7" />
-<cdparam x="249" y="380" />
+<cdparam x="249" y="77" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="148" minY="-13" maxY="385" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="8865" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="8851" />
 <extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="putMsgECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18144,50 +17694,50 @@ all subblocks
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8877" >
+<SUBCOMPONENT type="1203" id="8891" >
 <father id="8900" num="0" />
-<cdparam x="424" y="515" />
+<cdparam x="652" y="694" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="8876" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="8890" />
 <extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8879" >
+<SUBCOMPONENT type="1203" id="8889" >
 <father id="8900" num="1" />
-<cdparam x="481" y="515" />
+<cdparam x="652" y="658" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="8878" />
+<infoparam name="Primitive port" value="Event evtFromECU1" />
+<TGConnectingPoint num="0" id="8888" />
 <extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8881" >
+<SUBCOMPONENT type="1203" id="8887" >
 <father id="8900" num="2" />
-<cdparam x="544" y="515" />
+<cdparam x="652" y="611" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="8880" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="8886" />
 <extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18195,16 +17745,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8883" >
+<SUBCOMPONENT type="1203" id="8885" >
 <father id="8900" num="3" />
-<cdparam x="607" y="515" />
+<cdparam x="652" y="570" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="8882" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="8884" />
 <extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18212,16 +17762,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8885" >
+<SUBCOMPONENT type="1203" id="8883" >
 <father id="8900" num="4" />
-<cdparam x="652" y="570" />
+<cdparam x="607" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="8884" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="8882" />
 <extraparam>
-<Prop commName="evtToECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18229,16 +17779,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8887" >
+<SUBCOMPONENT type="1203" id="8881" >
 <father id="8900" num="5" />
-<cdparam x="652" y="611" />
+<cdparam x="544" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="8886" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="8880" />
 <extraparam>
-<Prop commName="dataToECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18246,34 +17796,34 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8889" >
+<SUBCOMPONENT type="1203" id="8879" >
 <father id="8900" num="6" />
-<cdparam x="652" y="658" />
+<cdparam x="481" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="8888" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="8878" />
 <extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8891" >
+<SUBCOMPONENT type="1203" id="8877" >
 <father id="8900" num="7" />
-<cdparam x="652" y="694" />
+<cdparam x="424" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="8890" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="8876" />
 <extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18300,16 +17850,16 @@ all subblocks
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8902" >
+<SUBCOMPONENT type="1203" id="8928" >
 <father id="8937" num="0" />
-<cdparam x="424" y="384" />
+<cdparam x="412" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECU1" />
-<TGConnectingPoint num="0" id="8901" />
+<infoparam name="Primitive port" value="Event putMsgECU1" />
+<TGConnectingPoint num="0" id="8927" />
 <extraparam>
-<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18317,16 +17867,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8904" >
+<SUBCOMPONENT type="1203" id="8926" >
 <father id="8937" num="1" />
-<cdparam x="481" y="384" />
+<cdparam x="375" y="213" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECU1" />
-<TGConnectingPoint num="0" id="8903" />
+<infoparam name="Primitive port" value="Channel inHSMECU1" />
+<TGConnectingPoint num="0" id="8925" />
 <extraparam>
-<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18334,50 +17884,50 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8906" >
+<SUBCOMPONENT type="1203" id="8924" >
 <father id="8937" num="2" />
-<cdparam x="544" y="384" />
+<cdparam x="375" y="137" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECU1" />
-<TGConnectingPoint num="0" id="8905" />
+<infoparam name="Primitive port" value="Event getMsgECU1" />
+<TGConnectingPoint num="0" id="8923" />
 <extraparam>
-<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8908" >
+<SUBCOMPONENT type="1203" id="8922" >
 <father id="8937" num="3" />
-<cdparam x="607" y="384" />
+<cdparam x="375" y="174" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECU1" />
-<TGConnectingPoint num="0" id="8907" />
+<infoparam name="Primitive port" value="Event doneHSMECU1" />
+<TGConnectingPoint num="0" id="8921" />
 <extraparam>
-<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8910" >
+<SUBCOMPONENT type="1203" id="8920" >
 <father id="8937" num="4" />
-<cdparam x="485" y="111" />
+<cdparam x="375" y="254" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event distributeKey" />
-<TGConnectingPoint num="0" id="8909" />
+<infoparam name="Primitive port" value="Channel outHSMECU1" />
+<TGConnectingPoint num="0" id="8919" />
 <extraparam>
-<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18385,33 +17935,33 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8912" >
+<SUBCOMPONENT type="1203" id="8918" >
 <father id="8937" num="5" />
-<cdparam x="575" y="111" />
+<cdparam x="375" y="330" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event done" />
-<TGConnectingPoint num="0" id="8911" />
+<infoparam name="Primitive port" value="Event macECU1" />
+<TGConnectingPoint num="0" id="8917" />
 <extraparam>
-<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8914" >
+<SUBCOMPONENT type="1203" id="8916" >
 <father id="8937" num="6" />
-<cdparam x="375" y="362" />
+<cdparam x="375" y="292" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECU1" />
-<TGConnectingPoint num="0" id="8913" />
+<infoparam name="Primitive port" value="Event encryptECU1" />
+<TGConnectingPoint num="0" id="8915" />
 <extraparam>
-<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18419,16 +17969,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8916" >
+<SUBCOMPONENT type="1203" id="8914" >
 <father id="8937" num="7" />
-<cdparam x="375" y="292" />
+<cdparam x="375" y="362" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECU1" />
-<TGConnectingPoint num="0" id="8915" />
+<infoparam name="Primitive port" value="Event generateKeyECU1" />
+<TGConnectingPoint num="0" id="8913" />
 <extraparam>
-<Prop commName="encryptECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="generateKeyECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18436,33 +17986,33 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8918" >
+<SUBCOMPONENT type="1203" id="8912" >
 <father id="8937" num="8" />
-<cdparam x="375" y="330" />
+<cdparam x="575" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECU1" />
-<TGConnectingPoint num="0" id="8917" />
+<infoparam name="Primitive port" value="Event done" />
+<TGConnectingPoint num="0" id="8911" />
 <extraparam>
-<Prop commName="macECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="done" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8920" >
+<SUBCOMPONENT type="1203" id="8910" >
 <father id="8937" num="9" />
-<cdparam x="375" y="254" />
+<cdparam x="485" y="111" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECU1" />
-<TGConnectingPoint num="0" id="8919" />
+<infoparam name="Primitive port" value="Event distributeKey" />
+<TGConnectingPoint num="0" id="8909" />
 <extraparam>
-<Prop commName="outHSMECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="distributeKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18470,50 +18020,50 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8922" >
+<SUBCOMPONENT type="1203" id="8908" >
 <father id="8937" num="10" />
-<cdparam x="375" y="174" />
+<cdparam x="607" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECU1" />
-<TGConnectingPoint num="0" id="8921" />
+<infoparam name="Primitive port" value="Event recvEvtECU1" />
+<TGConnectingPoint num="0" id="8907" />
 <extraparam>
-<Prop commName="doneHSMECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8924" >
+<SUBCOMPONENT type="1203" id="8906" >
 <father id="8937" num="11" />
-<cdparam x="375" y="137" />
+<cdparam x="544" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECU1" />
-<TGConnectingPoint num="0" id="8923" />
+<infoparam name="Primitive port" value="Channel recvDataECU1" />
+<TGConnectingPoint num="0" id="8905" />
 <extraparam>
-<Prop commName="getMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8926" >
+<SUBCOMPONENT type="1203" id="8904" >
 <father id="8937" num="12" />
-<cdparam x="375" y="213" />
+<cdparam x="481" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECU1" />
-<TGConnectingPoint num="0" id="8925" />
+<infoparam name="Primitive port" value="Channel sendDataECU1" />
+<TGConnectingPoint num="0" id="8903" />
 <extraparam>
-<Prop commName="inHSMECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sendDataECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18521,16 +18071,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8928" >
+<SUBCOMPONENT type="1203" id="8902" >
 <father id="8937" num="13" />
-<cdparam x="412" y="111" />
+<cdparam x="424" y="384" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECU1" />
-<TGConnectingPoint num="0" id="8927" />
+<infoparam name="Primitive port" value="Event sendEvtECU1" />
+<TGConnectingPoint num="0" id="8901" />
 <extraparam>
-<Prop commName="putMsgECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="sendEvtECU1" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18557,16 +18107,16 @@ all subblocks
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8939" >
+<SUBCOMPONENT type="1203" id="8953" >
 <father id="8962" num="0" />
-<cdparam x="995" y="90" />
+<cdparam x="995" y="139" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="8938" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="8952" />
 <extraparam>
-<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18574,51 +18124,34 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8941" >
+<SUBCOMPONENT type="1203" id="8951" >
 <father id="8962" num="1" />
-<cdparam x="995" y="393" />
+<cdparam x="995" y="185" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="8940" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="8950" />
 <extraparam>
-<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
-</extraparam>
-</SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8943" >
-<father id="8962" num="2" />
-<cdparam x="995" y="358" />
-<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="8942" />
-<extraparam>
-<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8945" >
-<father id="8962" num="3" />
-<cdparam x="995" y="319" />
+<SUBCOMPONENT type="1203" id="8949" >
+<father id="8962" num="2" />
+<cdparam x="995" y="231" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="8944" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="8948" />
 <extraparam>
-<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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="" />
@@ -18626,7 +18159,7 @@ all subblocks
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1203" id="8947" >
-<father id="8962" num="4" />
+<father id="8962" num="3" />
 <cdparam x="995" y="273" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -18642,50 +18175,67 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8949" >
-<father id="8962" num="5" />
-<cdparam x="995" y="231" />
+<SUBCOMPONENT type="1203" id="8945" >
+<father id="8962" num="4" />
+<cdparam x="995" y="319" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="8948" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="8944" />
 <extraparam>
-<Prop commName="inHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="encrypt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1203" id="8943" >
+<father id="8962" num="5" />
+<cdparam x="995" y="358" />
+<sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="8942" />
+<extraparam>
+<Prop commName="mac" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="0" typeOther="" />
+<Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8951" >
+<SUBCOMPONENT type="1203" id="8941" >
 <father id="8962" num="6" />
-<cdparam x="995" y="185" />
+<cdparam x="995" y="393" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="8950" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="8940" />
 <extraparam>
-<Prop commName="doneHSM" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKey" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8953" >
+<SUBCOMPONENT type="1203" id="8939" >
 <father id="8962" num="7" />
-<cdparam x="995" y="139" />
+<cdparam x="995" y="90" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="8952" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="8938" />
 <extraparam>
-<Prop commName="getMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="putMsg" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18713,50 +18263,50 @@ all subblocks
 <Attribute access="2" id="destination" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8964" >
+<SUBCOMPONENT type="1203" id="8986" >
 <father id="8995" num="0" />
-<cdparam x="1161" y="515" />
+<cdparam x="1389" y="707" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="8963" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="8985" />
 <extraparam>
-<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8966" >
+<SUBCOMPONENT type="1203" id="8984" >
 <father id="8995" num="1" />
-<cdparam x="1344" y="515" />
+<cdparam x="1389" y="665" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="8965" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="8983" />
 <extraparam>
-<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8968" >
+<SUBCOMPONENT type="1203" id="8982" >
 <father id="8995" num="2" />
-<cdparam x="1281" y="515" />
+<cdparam x="1389" y="626" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="8967" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="8981" />
 <extraparam>
-<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18764,118 +18314,118 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8970" >
+<SUBCOMPONENT type="1203" id="8980" >
 <father id="8995" num="3" />
-<cdparam x="1218" y="515" />
+<cdparam x="1389" y="581" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="8969" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="8979" />
 <extraparam>
-<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8972" >
+<SUBCOMPONENT type="1203" id="8978" >
 <father id="8995" num="4" />
-<cdparam x="1112" y="576" />
+<cdparam x="1112" y="686" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECU1" />
-<TGConnectingPoint num="0" id="8971" />
+<infoparam name="Primitive port" value="Channel dataFromECU1" />
+<TGConnectingPoint num="0" id="8977" />
 <extraparam>
-<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8974" >
+<SUBCOMPONENT type="1203" id="8976" >
 <father id="8995" num="5" />
-<cdparam x="1112" y="616" />
+<cdparam x="1112" y="650" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECU1" />
-<TGConnectingPoint num="0" id="8973" />
+<infoparam name="Primitive port" value="Event evtFromECU1" />
+<TGConnectingPoint num="0" id="8975" />
 <extraparam>
-<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8976" >
+<SUBCOMPONENT type="1203" id="8974" >
 <father id="8995" num="6" />
-<cdparam x="1112" y="650" />
+<cdparam x="1112" y="616" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtFromECU1" />
-<TGConnectingPoint num="0" id="8975" />
+<infoparam name="Primitive port" value="Channel dataToECU1" />
+<TGConnectingPoint num="0" id="8973" />
 <extraparam>
-<Prop commName="evtFromECU1" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dataToECU1" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8978" >
+<SUBCOMPONENT type="1203" id="8972" >
 <father id="8995" num="7" />
-<cdparam x="1112" y="686" />
+<cdparam x="1112" y="576" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECU1" />
-<TGConnectingPoint num="0" id="8977" />
+<infoparam name="Primitive port" value="Event evtToECU1" />
+<TGConnectingPoint num="0" id="8971" />
 <extraparam>
-<Prop commName="dataFromECU1" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECU1" commType="1" origin="true" finite="true" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8980" >
+<SUBCOMPONENT type="1203" id="8970" >
 <father id="8995" num="8" />
-<cdparam x="1389" y="581" />
+<cdparam x="1218" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="8979" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="8969" />
 <extraparam>
-<Prop commName="evtToECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8982" >
+<SUBCOMPONENT type="1203" id="8968" >
 <father id="8995" num="9" />
-<cdparam x="1389" y="626" />
+<cdparam x="1281" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="8981" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="8967" />
 <extraparam>
-<Prop commName="dataToECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvData" commType="0" origin="true" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18883,35 +18433,35 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8984" >
+<SUBCOMPONENT type="1203" id="8966" >
 <father id="8995" num="10" />
-<cdparam x="1389" y="665" />
+<cdparam x="1344" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="8983" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="8965" />
 <extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8986" >
+<SUBCOMPONENT type="1203" id="8964" >
 <father id="8995" num="11" />
-<cdparam x="1389" y="707" />
+<cdparam x="1161" y="515" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="201" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="8985" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="8963" />
 <extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -18937,67 +18487,67 @@ all subblocks
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="8997" >
+<SUBCOMPONENT type="1203" id="9019" >
 <father id="9028" num="0" />
-<cdparam x="1161" y="387" />
+<cdparam x="1218" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvt" />
-<TGConnectingPoint num="0" id="8996" />
+<infoparam name="Primitive port" value="Channel sendData" />
+<TGConnectingPoint num="0" id="9018" />
 <extraparam>
-<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
-<Type type="1" typeOther="" />
+<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="8999" >
+<SUBCOMPONENT type="1203" id="9017" >
 <father id="9028" num="1" />
-<cdparam x="1149" y="114" />
+<cdparam x="1281" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsg" />
-<TGConnectingPoint num="0" id="8998" />
+<infoparam name="Primitive port" value="Channel recvData" />
+<TGConnectingPoint num="0" id="9016" />
 <extraparam>
-<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9001" >
+<SUBCOMPONENT type="1203" id="9015" >
 <father id="9028" num="2" />
-<cdparam x="1112" y="216" />
+<cdparam x="1344" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSM" />
-<TGConnectingPoint num="0" id="9000" />
+<infoparam name="Primitive port" value="Event recvEvt" />
+<TGConnectingPoint num="0" id="9014" />
 <extraparam>
-<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9003" >
+<SUBCOMPONENT type="1203" id="9013" >
 <father id="9028" num="3" />
-<cdparam x="1112" y="140" />
+<cdparam x="1112" y="365" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsg" />
-<TGConnectingPoint num="0" id="9002" />
+<infoparam name="Primitive port" value="Event generateKey" />
+<TGConnectingPoint num="0" id="9012" />
 <extraparam>
-<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19005,84 +18555,84 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9005" >
+<SUBCOMPONENT type="1203" id="9011" >
 <father id="9028" num="4" />
-<cdparam x="1112" y="177" />
+<cdparam x="1112" y="295" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSM" />
-<TGConnectingPoint num="0" id="9004" />
+<infoparam name="Primitive port" value="Event encrypt" />
+<TGConnectingPoint num="0" id="9010" />
 <extraparam>
-<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9007" >
+<SUBCOMPONENT type="1203" id="9009" >
 <father id="9028" num="5" />
-<cdparam x="1112" y="257" />
+<cdparam x="1112" y="333" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSM" />
-<TGConnectingPoint num="0" id="9006" />
+<infoparam name="Primitive port" value="Event mac" />
+<TGConnectingPoint num="0" id="9008" />
 <extraparam>
-<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9009" >
+<SUBCOMPONENT type="1203" id="9007" >
 <father id="9028" num="6" />
-<cdparam x="1112" y="333" />
+<cdparam x="1112" y="257" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event mac" />
-<TGConnectingPoint num="0" id="9008" />
+<infoparam name="Primitive port" value="Channel outHSM" />
+<TGConnectingPoint num="0" id="9006" />
 <extraparam>
-<Prop commName="mac" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSM" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9011" >
+<SUBCOMPONENT type="1203" id="9005" >
 <father id="9028" num="7" />
-<cdparam x="1112" y="295" />
+<cdparam x="1112" y="177" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encrypt" />
-<TGConnectingPoint num="0" id="9010" />
+<infoparam name="Primitive port" value="Event doneHSM" />
+<TGConnectingPoint num="0" id="9004" />
 <extraparam>
-<Prop commName="encrypt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSM" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9013" >
+<SUBCOMPONENT type="1203" id="9003" >
 <father id="9028" num="8" />
-<cdparam x="1112" y="365" />
+<cdparam x="1112" y="140" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKey" />
-<TGConnectingPoint num="0" id="9012" />
+<infoparam name="Primitive port" value="Event getMsg" />
+<TGConnectingPoint num="0" id="9002" />
 <extraparam>
-<Prop commName="generateKey" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19090,52 +18640,52 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9015" >
+<SUBCOMPONENT type="1203" id="9001" >
 <father id="9028" num="9" />
-<cdparam x="1344" y="387" />
+<cdparam x="1112" y="216" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvt" />
-<TGConnectingPoint num="0" id="9014" />
+<infoparam name="Primitive port" value="Channel inHSM" />
+<TGConnectingPoint num="0" id="9000" />
 <extraparam>
-<Prop commName="recvEvt" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSM" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9017" >
+<SUBCOMPONENT type="1203" id="8999" >
 <father id="9028" num="10" />
-<cdparam x="1281" y="387" />
+<cdparam x="1149" y="114" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvData" />
-<TGConnectingPoint num="0" id="9016" />
+<infoparam name="Primitive port" value="Event putMsg" />
+<TGConnectingPoint num="0" id="8998" />
 <extraparam>
-<Prop commName="recvData" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsg" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9019" >
+<SUBCOMPONENT type="1203" id="8997" >
 <father id="9028" num="11" />
-<cdparam x="1218" y="387" />
+<cdparam x="1161" y="387" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendData" />
-<TGConnectingPoint num="0" id="9018" />
+<infoparam name="Primitive port" value="Event sendEvt" />
+<TGConnectingPoint num="0" id="8996" />
 <extraparam>
-<Prop commName="sendData" commType="0" origin="true" finite="false" blocking="true" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvt" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19160,16 +18710,16 @@ all subblocks
 <Attribute access="2" id="sizeOfMsg" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="9030" >
+<SUBCOMPONENT type="1203" id="9044" >
 <father id="9053" num="0" />
-<cdparam x="1719" y="172" />
+<cdparam x="1719" y="221" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="9029" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="9043" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19177,118 +18727,118 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9032" >
+<SUBCOMPONENT type="1203" id="9042" >
 <father id="9053" num="1" />
-<cdparam x="1719" y="475" />
+<cdparam x="1719" y="267" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="9031" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="9041" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9034" >
+<SUBCOMPONENT type="1203" id="9040" >
 <father id="9053" num="2" />
-<cdparam x="1719" y="440" />
+<cdparam x="1719" y="313" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="9033" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="9039" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9036" >
+<SUBCOMPONENT type="1203" id="9038" >
 <father id="9053" num="3" />
-<cdparam x="1719" y="401" />
+<cdparam x="1719" y="355" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="9035" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="9037" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9038" >
+<SUBCOMPONENT type="1203" id="9036" >
 <father id="9053" num="4" />
-<cdparam x="1719" y="355" />
+<cdparam x="1719" y="401" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="9037" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="9035" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9040" >
+<SUBCOMPONENT type="1203" id="9034" >
 <father id="9053" num="5" />
-<cdparam x="1719" y="313" />
+<cdparam x="1719" y="440" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="9039" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="9033" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9042" >
+<SUBCOMPONENT type="1203" id="9032" >
 <father id="9053" num="6" />
-<cdparam x="1719" y="267" />
+<cdparam x="1719" y="475" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="9041" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="9031" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="generateKeyECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9044" >
+<SUBCOMPONENT type="1203" id="9030" >
 <father id="9053" num="7" />
-<cdparam x="1719" y="221" />
+<cdparam x="1719" y="172" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="143" minY="-13" maxY="387" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="9043" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="9029" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="putMsgECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19315,33 +18865,33 @@ all subblocks
 <Attribute access="2" id="nbOfSamples" value="" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="9055" >
+<SUBCOMPONENT type="1203" id="9069" >
 <father id="9078" num="0" />
-<cdparam x="1894" y="575" />
+<cdparam x="1951" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="9054" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="9068" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9057" >
+<SUBCOMPONENT type="1203" id="9067" >
 <father id="9078" num="1" />
-<cdparam x="1845" y="726" />
+<cdparam x="2014" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataFromECUN" />
-<TGConnectingPoint num="0" id="9056" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="9066" />
 <extraparam>
-<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19349,16 +18899,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9059" >
+<SUBCOMPONENT type="1203" id="9065" >
 <father id="9078" num="2" />
-<cdparam x="1845" y="689" />
+<cdparam x="2077" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtFromECUN" />
-<TGConnectingPoint num="0" id="9058" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="9064" />
 <extraparam>
-<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19366,50 +18916,50 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9061" >
+<SUBCOMPONENT type="1203" id="9063" >
 <father id="9078" num="3" />
-<cdparam x="1845" y="657" />
+<cdparam x="1845" y="622" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel dataToECUN" />
-<TGConnectingPoint num="0" id="9060" />
+<infoparam name="Primitive port" value="Event evtToECUN" />
+<TGConnectingPoint num="0" id="9062" />
 <extraparam>
-<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9063" >
+<SUBCOMPONENT type="1203" id="9061" >
 <father id="9078" num="4" />
-<cdparam x="1845" y="622" />
+<cdparam x="1845" y="657" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event evtToECUN" />
-<TGConnectingPoint num="0" id="9062" />
+<infoparam name="Primitive port" value="Channel dataToECUN" />
+<TGConnectingPoint num="0" id="9060" />
 <extraparam>
-<Prop commName="evtToECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="dataToECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9065" >
+<SUBCOMPONENT type="1203" id="9059" >
 <father id="9078" num="5" />
-<cdparam x="2077" y="575" />
+<cdparam x="1845" y="689" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="9064" />
+<infoparam name="Primitive port" value="Event evtFromECUN" />
+<TGConnectingPoint num="0" id="9058" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="evtFromECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19417,16 +18967,16 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9067" >
+<SUBCOMPONENT type="1203" id="9057" >
 <father id="9078" num="6" />
-<cdparam x="2014" y="575" />
+<cdparam x="1845" y="726" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="9066" />
+<infoparam name="Primitive port" value="Channel dataFromECUN" />
+<TGConnectingPoint num="0" id="9056" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="dataFromECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19434,17 +18984,17 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9069" >
+<SUBCOMPONENT type="1203" id="9055" >
 <father id="9078" num="7" />
-<cdparam x="1951" y="575" />
+<cdparam x="1894" y="575" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="264" minY="-13" maxY="187" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="9068" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="9054" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19471,67 +19021,67 @@ all subblocks
 <Attribute access="2" id="i" value="0" type="0" typeOther="" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1203" id="9080" >
+<SUBCOMPONENT type="1203" id="9102" >
 <father id="9111" num="0" />
-<cdparam x="1894" y="481" />
+<cdparam x="1951" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event sendEvtECUN" />
-<TGConnectingPoint num="0" id="9079" />
+<infoparam name="Primitive port" value="Channel sendDataECUN" />
+<TGConnectingPoint num="0" id="9101" />
 <extraparam>
-<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9082" >
+<SUBCOMPONENT type="1203" id="9100" >
 <father id="9111" num="1" />
-<cdparam x="1882" y="208" />
+<cdparam x="2014" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event putMsgECUN" />
-<TGConnectingPoint num="0" id="9081" />
+<infoparam name="Primitive port" value="Channel recvDataECUN" />
+<TGConnectingPoint num="0" id="9099" />
 <extraparam>
-<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9084" >
+<SUBCOMPONENT type="1203" id="9098" >
 <father id="9111" num="2" />
-<cdparam x="1845" y="310" />
+<cdparam x="2077" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel inHSMECUN" />
-<TGConnectingPoint num="0" id="9083" />
+<infoparam name="Primitive port" value="Event recvEvtECUN" />
+<TGConnectingPoint num="0" id="9097" />
 <extraparam>
-<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9086" >
+<SUBCOMPONENT type="1203" id="9096" >
 <father id="9111" num="3" />
-<cdparam x="1845" y="234" />
+<cdparam x="1845" y="459" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event getMsgECUN" />
-<TGConnectingPoint num="0" id="9085" />
+<infoparam name="Primitive port" value="Event generateKeyECUN" />
+<TGConnectingPoint num="0" id="9095" />
 <extraparam>
-<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19539,84 +19089,84 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9088" >
+<SUBCOMPONENT type="1203" id="9094" >
 <father id="9111" num="4" />
-<cdparam x="1845" y="271" />
+<cdparam x="1845" y="389" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event doneHSMECUN" />
-<TGConnectingPoint num="0" id="9087" />
+<infoparam name="Primitive port" value="Event encryptECUN" />
+<TGConnectingPoint num="0" id="9093" />
 <extraparam>
-<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9090" >
+<SUBCOMPONENT type="1203" id="9092" >
 <father id="9111" num="5" />
-<cdparam x="1845" y="351" />
+<cdparam x="1845" y="427" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel outHSMECUN" />
-<TGConnectingPoint num="0" id="9089" />
+<infoparam name="Primitive port" value="Event macECUN" />
+<TGConnectingPoint num="0" id="9091" />
 <extraparam>
-<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9092" >
+<SUBCOMPONENT type="1203" id="9090" >
 <father id="9111" num="6" />
-<cdparam x="1845" y="427" />
+<cdparam x="1845" y="351" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event macECUN" />
-<TGConnectingPoint num="0" id="9091" />
+<infoparam name="Primitive port" value="Channel outHSMECUN" />
+<TGConnectingPoint num="0" id="9089" />
 <extraparam>
-<Prop commName="macECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="outHSMECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9094" >
+<SUBCOMPONENT type="1203" id="9088" >
 <father id="9111" num="7" />
-<cdparam x="1845" y="389" />
+<cdparam x="1845" y="271" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event encryptECUN" />
-<TGConnectingPoint num="0" id="9093" />
+<infoparam name="Primitive port" value="Event doneHSMECUN" />
+<TGConnectingPoint num="0" id="9087" />
 <extraparam>
-<Prop commName="encryptECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="doneHSMECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9096" >
+<SUBCOMPONENT type="1203" id="9086" >
 <father id="9111" num="8" />
-<cdparam x="1845" y="459" />
+<cdparam x="1845" y="234" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event generateKeyECUN" />
-<TGConnectingPoint num="0" id="9095" />
+<infoparam name="Primitive port" value="Event getMsgECUN" />
+<TGConnectingPoint num="0" id="9085" />
 <extraparam>
-<Prop commName="generateKeyECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Prop commName="getMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
 <Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19624,51 +19174,51 @@ all subblocks
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9098" >
+<SUBCOMPONENT type="1203" id="9084" >
 <father id="9111" num="9" />
-<cdparam x="2077" y="481" />
+<cdparam x="1845" y="310" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Event recvEvtECUN" />
-<TGConnectingPoint num="0" id="9097" />
+<infoparam name="Primitive port" value="Channel inHSMECUN" />
+<TGConnectingPoint num="0" id="9083" />
 <extraparam>
-<Prop commName="recvEvtECUN" commType="1" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="1" typeOther="" />
+<Prop commName="inHSMECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" 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>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9100" >
+<SUBCOMPONENT type="1203" id="9082" >
 <father id="9111" num="10" />
-<cdparam x="2014" y="481" />
+<cdparam x="1882" y="208" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel recvDataECUN" />
-<TGConnectingPoint num="0" id="9099" />
+<infoparam name="Primitive port" value="Event putMsgECUN" />
+<TGConnectingPoint num="0" id="9081" />
 <extraparam>
-<Prop commName="recvDataECUN" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="putMsgECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1203" id="9102" >
+<SUBCOMPONENT type="1203" id="9080" >
 <father id="9111" num="11" />
-<cdparam x="1951" y="481" />
+<cdparam x="1894" y="481" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="263" minY="-13" maxY="260" />
-<infoparam name="Primitive port" value="Channel sendDataECUN" />
-<TGConnectingPoint num="0" id="9101" />
+<infoparam name="Primitive port" value="Event sendEvtECUN" />
+<TGConnectingPoint num="0" id="9079" />
 <extraparam>
-<Prop commName="sendDataECUN" commType="0" origin="true" finite="false" blocking="false" maxSamples="4" widthSamples="1" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
-<Type type="0" typeOther="" />
+<Prop commName="sendEvtECUN" commType="1" origin="true" finite="false" blocking="false" maxSamples="8" widthSamples="4" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="-1" dataFlowType="" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" />
+<Type type="1" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -19731,7 +19281,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9119" >
 <father id="9122" num="0" />
 <cdparam x="1021" y="322" />
-<sizeparam width="32" height="16" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="36" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="10 us" />
@@ -19754,7 +19304,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9123" >
 <father id="9130" num="0" />
 <cdparam x="870" y="278" />
-<sizeparam width="30" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="37" 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="[ 0% ]" />
@@ -19762,7 +19312,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9124" >
 <father id="9130" num="1" />
 <cdparam x="951" y="277" />
-<sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="45" 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="[ 70% ]" />
@@ -19770,7 +19320,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9125" >
 <father id="9130" num="2" />
 <cdparam x="936" y="312" />
-<sizeparam width="37" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="45" 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="[ 30% ]" />
@@ -19778,7 +19328,7 @@ all subblocks
 
 <COMPONENT type="301" id="9147" >
 <cdparam x="208" y="126" />
-<sizeparam width="336" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="391" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="accounts for traffic caused by ECUs not taken into account
@@ -19805,8 +19355,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1020" id="9151" >
-<cdparam x="691" y="211" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="686" y="211" />
+<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="for loop" value="10" />
@@ -19825,8 +19375,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1017" id="9156" >
-<cdparam x="661" y="257" />
-<sizeparam width="143" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="652" y="257" />
+<sizeparam width="160" 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="evts=?endProcessing()" />
@@ -19847,8 +19397,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1014" id="9162" >
-<cdparam x="512" y="169" />
-<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="494" y="169" />
+<sizeparam width="205" 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(evts=0;evts==0;evts=evts)" />
@@ -19888,8 +19438,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9171" >
-<cdparam x="800" y="304" />
-<sizeparam width="94" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="796" y="304" />
+<sizeparam width="102" 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="lowPrioLoad(1)" />
@@ -19902,7 +19452,7 @@ all subblocks
 
 <COMPONENT type="301" id="9188" >
 <cdparam x="1082" y="303" />
-<sizeparam width="67" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="73" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="idle time
@@ -19930,7 +19480,7 @@ all subblocks
 
 <COMPONENT type="301" id="9205" >
 <cdparam x="526" y="287" />
-<sizeparam width="173" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="194" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="check if processing finished
@@ -19958,7 +19508,7 @@ all subblocks
 
 <COMPONENT type="301" id="9222" >
 <cdparam x="897" y="423" />
-<sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="155" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
@@ -19986,7 +19536,7 @@ all subblocks
 
 <COMPONENT type="301" id="9239" >
 <cdparam x="732" y="390" />
-<sizeparam width="139" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="155" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="high priority Bus Load
@@ -20013,8 +19563,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9242" >
-<cdparam x="883" y="344" />
-<sizeparam width="99" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="878" y="344" />
+<sizeparam width="109" 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="highPrioLoad(1)" />
@@ -20045,7 +19595,7 @@ all subblocks
 <cdparam x="782" y="225" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to choice" value="null" />
-<P1  x="780" y="225" id="9149" />
+<P1  x="784" y="225" id="9149" />
 <P2  x="931" y="257" id="9126" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -20109,7 +19659,7 @@ all subblocks
 <cdparam x="691" y="183" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for loop to for loop" value="null" />
-<P1  x="680" y="183" id="9160" />
+<P1  x="699" y="183" id="9160" />
 <P2  x="735" y="206" id="9148" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -20144,8 +19694,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9261" >
-<cdparam x="252" y="186" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="248" y="186" />
+<sizeparam width="56" 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="done() " />
@@ -20157,8 +19707,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9264" >
-<cdparam x="227" y="146" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="221" y="146" />
+<sizeparam width="101" 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="distributeKey()" />
@@ -20170,8 +19720,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9267" >
-<cdparam x="244" y="280" />
-<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="239" y="280" />
+<sizeparam width="113" 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="endProcessing()" />
@@ -20228,8 +19778,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9276" >
-<cdparam x="5" y="362" />
-<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="0" y="362" />
+<sizeparam width="156" 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="read channel" value="inHSMECU1(sizeOfMsg) " />
@@ -20241,8 +19791,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9279" >
-<cdparam x="2" y="315" />
-<sizeparam width="154" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="-3" y="315" />
+<sizeparam width="164" 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="putMsgECU1(sizeOfMsg) " />
@@ -20291,8 +19841,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9290" >
-<cdparam x="705" y="381" />
-<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="699" y="381" />
+<sizeparam width="162" 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="outHSMECU1(sizeOfMsg)" />
@@ -20316,7 +19866,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9291" >
 <father id="9294" num="0" />
 <cdparam x="604" y="394" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
@@ -20334,7 +19884,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9295" >
 <father id="9298" num="0" />
 <cdparam x="255" y="393" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
@@ -20352,7 +19902,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9299" >
 <father id="9302" num="0" />
 <cdparam x="419" y="397" />
-<sizeparam width="81" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
@@ -20368,8 +19918,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9307" >
-<cdparam x="558" y="196" />
-<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="553" y="196" />
+<sizeparam width="112" 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="doneHSMECU1()" />
@@ -20403,8 +19953,8 @@ all subblocks
 </SUBCOMPONENT>
 
 <COMPONENT type="1010" id="9318" >
-<cdparam x="704" y="329" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="698" y="329" />
+<sizeparam width="164" 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="getMsgECU1(sizeOfMsg) " />
@@ -20417,8 +19967,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9321" >
-<cdparam x="502" y="322" />
-<sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="496" y="322" />
+<sizeparam width="197" 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="generateKeyECU1(sizeOfMsg) " />
@@ -20431,8 +19981,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9324" >
-<cdparam x="340" y="321" />
-<sizeparam width="136" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="336" y="321" />
+<sizeparam width="144" 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="macECU1(sizeOfMsg) " />
@@ -20445,8 +19995,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9327" >
-<cdparam x="168" y="321" />
-<sizeparam width="155" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="163" y="321" />
+<sizeparam width="165" 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="encryptECU1(sizeOfMsg) " />
@@ -20477,8 +20027,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9341" >
-<cdparam x="206" y="89" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="203" y="89" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -20531,7 +20081,7 @@ all subblocks
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="293" y="103" id="9340" />
+<P1  x="295" y="103" id="9340" />
 <P2  x="541" y="152" id="9309" />
 <Point x="476" y="121" />
 <AutomaticDrawing  data="true" />
@@ -20678,8 +20228,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9369" >
-<cdparam x="455" y="451" />
-<sizeparam width="175" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="447" y="451" />
+<sizeparam width="191" 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="recvDataECU1(nbOfSamples)" />
@@ -20691,8 +20241,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9372" >
-<cdparam x="468" y="396" />
-<sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="460" y="396" />
+<sizeparam width="180" 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="recvEvtECU1(nbOfSamples)" />
@@ -20705,8 +20255,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9375" >
-<cdparam x="440" y="351" />
-<sizeparam width="211" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="427" y="351" />
+<sizeparam width="236" 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="action state" value="nbOfSamples = (nbOfSamples * 7)/8" />
@@ -20715,8 +20265,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9378" >
-<cdparam x="462" y="283" />
-<sizeparam width="168" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="455" y="283" />
+<sizeparam width="183" 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="read channel" value="dataToECU1(nbOfSamples) " />
@@ -20728,8 +20278,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9381" >
-<cdparam x="466" y="230" />
-<sizeparam width="159" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="459" y="230" />
+<sizeparam width="173" 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="evtToECU1(nbOfSamples) " />
@@ -20751,8 +20301,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9386" >
-<cdparam x="182" y="451" />
-<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="175" y="451" />
+<sizeparam width="195" 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="dataFromECU1(nbOfSamples)" />
@@ -20764,8 +20314,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9389" >
-<cdparam x="187" y="400" />
-<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="180" y="400" />
+<sizeparam width="185" 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="evtFromECU1(nbOfSamples)" />
@@ -20778,8 +20328,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9392" >
-<cdparam x="164" y="353" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="150" y="353" />
+<sizeparam width="244" 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="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
@@ -20788,8 +20338,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9395" >
-<cdparam x="178" y="284" />
-<sizeparam width="184" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="170" y="284" />
+<sizeparam width="200" 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="read channel" value="sendDataECU1(nbOfSamples) " />
@@ -20801,8 +20351,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9398" >
-<cdparam x="182" y="230" />
-<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="175" y="230" />
+<sizeparam width="189" 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="sendEvtECU1(nbOfSamples) " />
@@ -20815,8 +20365,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9401" >
-<cdparam x="247" y="96" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="241" y="96" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -20863,7 +20413,7 @@ all subblocks
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="328" y="110" id="9400" />
+<P1  x="333" y="110" id="9400" />
 <P2  x="424" y="163" id="9402" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -20968,8 +20518,8 @@ all subblocks
 
 <TMLActivityDiagramPanel name="DistributionManager_ECU1" minX="10" maxX="1400" minY="10" maxY="900" >
 <COMPONENT type="1010" id="9431" >
-<cdparam x="220" y="504" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="215" y="504" />
+<sizeparam width="116" 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="doneHSMECU1() " />
@@ -20982,7 +20532,7 @@ all subblocks
 
 <COMPONENT type="301" id="9448" >
 <cdparam x="609" y="75" />
-<sizeparam width="130" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
@@ -21009,8 +20559,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9451" >
-<cdparam x="216" y="371" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="211" y="371" />
+<sizeparam width="116" 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="doneHSMECU1() " />
@@ -21022,8 +20572,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9454" >
-<cdparam x="215" y="285" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="210" y="285" />
+<sizeparam width="116" 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="doneHSMECU1() " />
@@ -21035,8 +20585,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9457" >
-<cdparam x="210" y="191" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="205" y="191" />
+<sizeparam width="116" 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="doneHSMECU1() " />
@@ -21048,8 +20598,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9460" >
-<cdparam x="217" y="420" />
-<sizeparam width="106" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="213" y="420" />
+<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="getMsgECU1(59)" />
@@ -21062,8 +20612,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9463" >
-<cdparam x="217" y="468" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="213" y="468" />
+<sizeparam width="121" 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="read channel" value="outHSMECU1(59) " />
@@ -21076,8 +20626,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9466" >
-<cdparam x="224" y="336" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="221" y="336" />
+<sizeparam width="95" 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="macECU1(43)" />
@@ -21090,8 +20640,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9469" >
-<cdparam x="209" y="238" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="205" y="238" />
+<sizeparam width="116" 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="encryptECU1(43)" />
@@ -21104,8 +20654,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9472" >
-<cdparam x="195" y="151" />
-<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="189" y="151" />
+<sizeparam width="148" 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="generateKeyECU1(32)" />
@@ -21118,8 +20668,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9475" >
-<cdparam x="661" y="366" />
-<sizeparam width="47" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="658" y="366" />
+<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="send event" value="done()" />
@@ -21131,8 +20681,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9478" >
-<cdparam x="210" y="100" />
-<sizeparam width="98" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="207" y="100" />
+<sizeparam width="105" 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="distributeKey() " />
@@ -21153,8 +20703,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9483" >
-<cdparam x="593" y="319" />
-<sizeparam width="180" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="586" y="319" />
+<sizeparam width="195" 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="read channel" value="recvDataECU1(nbOfSamples) " />
@@ -21166,8 +20716,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9486" >
-<cdparam x="597" y="261" />
-<sizeparam width="170" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="590" y="261" />
+<sizeparam width="184" 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="recvEvtECU1(nbOfSamples) " />
@@ -21180,8 +20730,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9489" >
-<cdparam x="623" y="213" />
-<sizeparam width="120" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="618" y="213" />
+<sizeparam width="130" 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="sendDataECU1(59)" />
@@ -21194,7 +20744,7 @@ all subblocks
 
 <COMPONENT type="301" id="9506" >
 <cdparam x="14" y="216" />
-<sizeparam width="209" height="39" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="222" 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="UML Note" value="59 bytes
@@ -21225,8 +20775,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9509" >
-<cdparam x="633" y="162" />
-<sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="629" y="162" />
+<sizeparam width="119" 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="sendEvtECU1(59)" />
@@ -21434,8 +20984,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9537" >
-<cdparam x="21" y="362" />
-<sizeparam width="114" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="17" y="362" />
+<sizeparam width="123" 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="read channel" value="inHSM(sizeOfMsg) " />
@@ -21447,8 +20997,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9540" >
-<cdparam x="20" y="315" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="14" y="315" />
+<sizeparam width="131" 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="putMsg(sizeOfMsg) " />
@@ -21497,8 +21047,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9551" >
-<cdparam x="631" y="379" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="626" y="379" />
+<sizeparam width="129" 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="outHSM(sizeOfMsg)" />
@@ -21521,7 +21071,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9552" >
 <father id="9555" num="0" />
 <cdparam x="514" y="392" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
@@ -21539,7 +21089,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9556" >
 <father id="9559" num="0" />
 <cdparam x="234" y="384" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
@@ -21557,7 +21107,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9560" >
 <father id="9563" num="0" />
 <cdparam x="372" y="388" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
@@ -21573,8 +21123,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9568" >
-<cdparam x="573" y="196" />
-<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="570" y="196" />
+<sizeparam width="79" 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="doneHSM()" />
@@ -21601,15 +21151,15 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9569" >
 <father id="9576" num="0" />
 <cdparam x="620" y="159" />
-<sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="20" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="154" maxX="154" minY="7" maxY="7" />
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
 <COMPONENT type="1010" id="9579" >
-<cdparam x="631" y="327" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="625" y="327" />
+<sizeparam width="131" 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="getMsg(sizeOfMsg) " />
@@ -21622,8 +21172,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9582" >
-<cdparam x="431" y="320" />
-<sizeparam width="147" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="422" y="320" />
+<sizeparam width="164" 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="generateKey(sizeOfMsg) " />
@@ -21636,8 +21186,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9585" >
-<cdparam x="310" y="312" />
-<sizeparam width="102" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="306" y="312" />
+<sizeparam width="111" 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="mac(sizeOfMsg) " />
@@ -21650,8 +21200,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9588" >
-<cdparam x="166" y="312" />
-<sizeparam width="117" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="158" y="312" />
+<sizeparam width="132" 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="encrypt(sizeOfMsg) " />
@@ -21682,8 +21232,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9602" >
-<cdparam x="209" y="89" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="203" y="89" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -21736,7 +21286,7 @@ all subblocks
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="290" y="103" id="9601" />
+<P1  x="295" y="103" id="9601" />
 <P2  x="541" y="152" id="9570" />
 <Point x="476" y="121" />
 <AutomaticDrawing  data="true" />
@@ -21883,8 +21433,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9630" >
-<cdparam x="535" y="516" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="527" y="516" />
+<sizeparam width="158" 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="recvData(nbOfSamples)" />
@@ -21896,8 +21446,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9633" >
-<cdparam x="543" y="460" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="536" y="460" />
+<sizeparam width="147" 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="recvEvt(nbOfSamples)" />
@@ -21910,8 +21460,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9636" >
-<cdparam x="514" y="342" />
-<sizeparam width="183" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="506" y="342" />
+<sizeparam width="199" 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="read channel" value="dataFromECU1(nbOfSamples) " />
@@ -21923,8 +21473,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9639" >
-<cdparam x="518" y="292" />
-<sizeparam width="174" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="511" y="292" />
+<sizeparam width="189" 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="evtFromECU1(nbOfSamples) " />
@@ -21937,8 +21487,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9642" >
-<cdparam x="36" y="573" />
-<sizeparam width="165" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="29" y="573" />
+<sizeparam width="179" 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="dataToECU1(nbOfSamples)" />
@@ -21950,8 +21500,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9645" >
-<cdparam x="45" y="527" />
-<sizeparam width="156" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="39" y="527" />
+<sizeparam width="169" 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="evtToECU1(nbOfSamples)" />
@@ -21977,7 +21527,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9646" >
 <father id="9653" num="0" />
 <cdparam x="139" y="456" />
-<sizeparam width="94" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" 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="[destination == 1]" />
@@ -21985,7 +21535,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9647" >
 <father id="9653" num="1" />
 <cdparam x="249" y="455" />
-<sizeparam width="97" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="121" 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="[destination == 2 ]" />
@@ -21993,7 +21543,7 @@ all subblocks
 <SUBCOMPONENT type="-1" id="9648" >
 <father id="9653" num="2" />
 <cdparam x="234" y="490" />
-<sizeparam width="9" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<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="[ ]" />
@@ -22009,8 +21559,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9658" >
-<cdparam x="148" y="322" />
-<sizeparam width="151" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="140" y="322" />
+<sizeparam width="167" 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="read channel" value="sendData(nbOfSamples) " />
@@ -22022,8 +21572,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9661" >
-<cdparam x="120" y="275" />
-<sizeparam width="208" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="107" y="275" />
+<sizeparam width="235" 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="sendEvt(nbOfSamples, destination) " />
@@ -22037,8 +21587,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9664" >
-<cdparam x="361" y="106" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="355" y="106" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -22074,8 +21624,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9680" >
-<cdparam x="239" y="573" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="232" y="573" />
+<sizeparam width="180" 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="dataToECUN(nbOfSamples)" />
@@ -22087,8 +21637,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9683" >
-<cdparam x="240" y="527" />
-<sizeparam width="158" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="234" y="527" />
+<sizeparam width="170" 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="evtToECUN(nbOfSamples)" />
@@ -22110,8 +21660,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9688" >
-<cdparam x="500" y="403" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="486" y="403" />
+<sizeparam width="244" 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="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
@@ -22120,8 +21670,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9691" >
-<cdparam x="117" y="370" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="103" y="370" />
+<sizeparam width="244" 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="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
@@ -22139,8 +21689,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9696" >
-<cdparam x="863" y="525" />
-<sizeparam width="142" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="855" y="525" />
+<sizeparam width="158" 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="recvData(nbOfSamples)" />
@@ -22152,8 +21702,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9699" >
-<cdparam x="871" y="469" />
-<sizeparam width="132" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="864" y="469" />
+<sizeparam width="147" 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="recvEvt(nbOfSamples)" />
@@ -22166,8 +21716,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9702" >
-<cdparam x="841" y="351" />
-<sizeparam width="185" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="833" y="351" />
+<sizeparam width="200" 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="read channel" value="dataFromECUN(nbOfSamples) " />
@@ -22179,8 +21729,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9705" >
-<cdparam x="845" y="301" />
-<sizeparam width="176" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="838" y="301" />
+<sizeparam width="190" 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="evtFromECUN(nbOfSamples) " />
@@ -22193,8 +21743,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9708" >
-<cdparam x="828" y="412" />
-<sizeparam width="217" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="814" y="412" />
+<sizeparam width="244" 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="action state" value="nbOfSamples = (nbOfSamples * 8) / 9" />
@@ -22230,7 +21780,7 @@ all subblocks
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="442" y="120" id="9663" />
+<P1  x="447" y="120" id="9663" />
 <P2  x="606" y="185" id="9665" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -22399,8 +21949,8 @@ all subblocks
 
 <TMLActivityDiagramPanel name="KM" minX="10" maxX="1400" minY="10" maxY="900" >
 <COMPONENT type="1009" id="9735" >
-<cdparam x="120" y="184" />
-<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="111" y="184" />
+<sizeparam width="162" 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="read channel" value="recvData(nbOfSamples) " />
@@ -22412,8 +21962,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9738" >
-<cdparam x="120" y="120" />
-<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="112" y="120" />
+<sizeparam width="151" 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="recvEvt(nbOfSamples) " />
@@ -22426,8 +21976,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9741" >
-<cdparam x="515" y="536" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="511" y="536" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22440,7 +21990,7 @@ all subblocks
 
 <COMPONENT type="301" id="9758" >
 <cdparam x="609" y="75" />
-<sizeparam width="127" height="36" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
@@ -22467,8 +22017,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9761" >
-<cdparam x="511" y="403" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="507" y="403" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22480,8 +22030,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9764" >
-<cdparam x="510" y="317" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="506" y="317" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22493,8 +22043,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9767" >
-<cdparam x="513" y="452" />
-<sizeparam width="72" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="508" y="452" />
+<sizeparam width="82" 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="getMsg(59)" />
@@ -22507,8 +22057,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9770" >
-<cdparam x="513" y="500" />
-<sizeparam width="78" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="508" y="500" />
+<sizeparam width="88" 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="read channel" value="outHSM(59) " />
@@ -22520,8 +22070,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9773" >
-<cdparam x="519" y="368" />
-<sizeparam width="56" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="516" y="368" />
+<sizeparam width="62" 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="mac(43)" />
@@ -22534,8 +22084,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9776" >
-<cdparam x="510" y="269" />
-<sizeparam width="71" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="504" y="269" />
+<sizeparam width="83" 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="encrypt(43)" />
@@ -22557,8 +22107,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9781" >
-<cdparam x="723" y="347" />
-<sizeparam width="145" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="714" y="347" />
+<sizeparam width="162" 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="read channel" value="recvData(nbOfSamples) " />
@@ -22570,8 +22120,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9784" >
-<cdparam x="727" y="289" />
-<sizeparam width="135" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="719" y="289" />
+<sizeparam width="151" 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="recvEvt(nbOfSamples) " />
@@ -22593,8 +22143,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9789" >
-<cdparam x="177" y="413" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="173" y="413" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22606,8 +22156,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9792" >
-<cdparam x="144" y="360" />
-<sizeparam width="133" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="136" y="360" />
+<sizeparam width="149" 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="encrypt(nbOfSamples)" />
@@ -22620,8 +22170,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9795" >
-<cdparam x="737" y="410" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="732" y="410" />
+<sizeparam width="128" 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="mac(nbOfSamples)" />
@@ -22634,8 +22184,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9798" >
-<cdparam x="146" y="250" />
-<sizeparam width="118" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="141" y="250" />
+<sizeparam width="128" 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="mac(nbOfSamples)" />
@@ -22648,8 +22198,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9801" >
-<cdparam x="760" y="472" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="756" y="472" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22661,8 +22211,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9804" >
-<cdparam x="170" y="307" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="307" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22674,8 +22224,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9807" >
-<cdparam x="765" y="571" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="761" y="571" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22687,8 +22237,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9810" >
-<cdparam x="766" y="518" />
-<sizeparam width="64" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="761" y="518" />
+<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="send event" value="encrypt(1)" />
@@ -22701,8 +22251,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9813" >
-<cdparam x="807" y="663" />
-<sizeparam width="75" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="803" y="663" />
+<sizeparam width="83" 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="doneHSM() " />
@@ -22714,8 +22264,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9816" >
-<cdparam x="798" y="616" />
-<sizeparam width="49" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="795" y="616" />
+<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 event" value="mac(1)" />
@@ -22728,8 +22278,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9819" >
-<cdparam x="843" y="730" />
-<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="837" y="730" />
+<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="sendEvt(1, 1)" />
@@ -22743,8 +22293,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9822" >
-<cdparam x="756" y="190" />
-<sizeparam width="89" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="749" y="190" />
+<sizeparam width="102" 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="sendEvt(59, 2)" />
@@ -22758,8 +22308,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9825" >
-<cdparam x="856" y="771" />
-<sizeparam width="79" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="851" y="771" />
+<sizeparam width="89" 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="sendData(1)" />
@@ -22771,8 +22321,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9828" >
-<cdparam x="752" y="241" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="747" y="241" />
+<sizeparam width="97" 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="sendData(59)" />
@@ -23068,7 +22618,7 @@ all subblocks
 
 <TMLActivityDiagramPanel name="HSM_ECUN" minX="10" maxX="1400" minY="10" maxY="900" >
 <COMPONENT type="1001" id="9864" >
-<cdparam x="70" y="410" />
+<cdparam x="127" y="462" />
 <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" />
@@ -23077,8 +22627,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9867" >
-<cdparam x="4" y="362" />
-<sizeparam width="149" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="58" y="390" />
+<sizeparam width="157" 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="read channel" value="inHSMECUN(sizeOfMsg) " />
@@ -23090,8 +22640,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9870" >
-<cdparam x="3" y="315" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="65" y="355" />
+<sizeparam width="165" 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="putMsgECUN(sizeOfMsg) " />
@@ -23104,7 +22654,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1001" id="9872" >
-<cdparam x="232" y="435" />
+<cdparam x="309" y="466" />
 <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" />
@@ -23113,7 +22663,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1001" id="9874" >
-<cdparam x="415" y="483" />
+<cdparam x="475" y="469" />
 <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" />
@@ -23122,7 +22672,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1001" id="9876" >
-<cdparam x="551" y="435" />
+<cdparam x="649" y="448" />
 <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" />
@@ -23131,7 +22681,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1001" id="9878" >
-<cdparam x="796" y="443" />
+<cdparam x="844" y="454" />
 <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" />
@@ -23140,8 +22690,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9881" >
-<cdparam x="729" y="392" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="772" y="403" />
+<sizeparam width="163" 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="outHSMECUN(sizeOfMsg)" />
@@ -23153,7 +22703,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1013" id="9885" >
-<cdparam x="555" y="383" />
+<cdparam x="653" y="396" />
 <sizeparam width="10" 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" />
@@ -23163,15 +22713,15 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="-1" id="9882" >
 <father id="9885" num="0" />
-<cdparam x="570" y="403" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="668" y="416" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="sizeOfMsg*60" />
 </SUBCOMPONENT>
 
 <COMPONENT type="1013" id="9889" >
-<cdparam x="238" y="374" />
+<cdparam x="315" y="405" />
 <sizeparam width="10" 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" />
@@ -23181,15 +22731,15 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="-1" id="9886" >
 <father id="9889" num="0" />
-<cdparam x="253" y="394" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="330" y="425" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
 <COMPONENT type="1013" id="9893" >
-<cdparam x="430" y="435" />
+<cdparam x="479" y="403" />
 <sizeparam width="10" 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" />
@@ -23199,15 +22749,15 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="-1" id="9890" >
 <father id="9893" num="0" />
-<cdparam x="445" y="455" />
-<sizeparam width="76" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="494" y="423" />
+<sizeparam width="83" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" />
 <infoparam name="value of the delay" value="15*sizeOfMsg" />
 </SUBCOMPONENT>
 
 <COMPONENT type="1001" id="9895" >
-<cdparam x="600" y="243" />
+<cdparam x="676" y="240" />
 <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" />
@@ -23216,8 +22766,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9898" >
-<cdparam x="556" y="196" />
-<sizeparam width="107" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="630" y="198" />
+<sizeparam width="113" 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="doneHSMECUN()" />
@@ -23229,7 +22779,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1016" id="9906" >
-<cdparam x="466" y="152" />
+<cdparam x="562" y="165" />
 <sizeparam width="150" height="5" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
@@ -23243,16 +22793,16 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="-1" id="9899" >
 <father id="9906" num="0" />
-<cdparam x="620" y="159" />
-<sizeparam width="14" height="16" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="716" y="172" />
+<sizeparam width="20" height="15" minWidth="10" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="154" maxX="154" minY="7" maxY="7" />
 <infoparam name="Sequence" value="&gt;&gt;" />
 </SUBCOMPONENT>
 
 <COMPONENT type="1010" id="9909" >
-<cdparam x="729" y="340" />
-<sizeparam width="153" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="771" y="351" />
+<sizeparam width="165" 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="getMsgECUN(sizeOfMsg) " />
@@ -23265,8 +22815,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9912" >
-<cdparam x="469" y="331" />
-<sizeparam width="182" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="562" y="351" />
+<sizeparam width="198" 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="generateKeyECUN(sizeOfMsg) " />
@@ -23279,8 +22829,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9915" >
-<cdparam x="355" y="372" />
-<sizeparam width="137" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="413" y="352" />
+<sizeparam width="145" 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="macECUN(sizeOfMsg) " />
@@ -23293,8 +22843,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9918" >
-<cdparam x="167" y="322" />
-<sizeparam width="152" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="237" y="353" />
+<sizeparam width="166" 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="encryptECUN(sizeOfMsg) " />
@@ -23307,7 +22857,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1018" id="9929" >
-<cdparam x="383" y="209" />
+<cdparam x="572" y="229" />
 <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" />
@@ -23325,8 +22875,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9932" >
-<cdparam x="209" y="89" />
-<sizeparam width="81" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="526" y="124" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -23335,7 +22885,7 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1000" id="9934" >
-<cdparam x="242" y="40" />
+<cdparam x="565" y="78" />
 <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" />
@@ -23344,172 +22894,163 @@ all subblocks
 </COMPONENT>
 
 <CONNECTOR type="115" id="9935" >
-<cdparam x="358" y="224" />
+<cdparam x="454" y="237" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="9923" />
-<P2  x="79" y="310" id="9868" />
+<P1  x="547" y="244" id="9923" />
+<P2  x="147" y="350" id="9868" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9936" >
-<cdparam x="534" y="157" />
+<cdparam x="630" y="170" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to select" value="null" />
-<P1  x="515" y="157" id="9902" />
-<P2  x="398" y="199" id="9919" />
+<P1  x="587" y="170" id="9901" />
+<P2  x="587" y="219" id="9919" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9937" >
-<cdparam x="585" y="218" />
+<cdparam x="681" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="9924" />
-<P2  x="805" y="335" id="9907" />
+<P1  x="627" y="244" id="9924" />
+<P2  x="853" y="346" id="9907" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9938" >
-<cdparam x="245" y="91" />
+<cdparam x="318" y="114" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to for ever loop" value="null" />
-<P1  x="249" y="60" id="9933" />
-<P2  x="249" y="84" id="9930" />
+<P1  x="572" y="98" id="9933" />
+<P2  x="572" y="119" id="9930" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9940" >
 <cdparam x="423" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="290" y="103" id="9931" />
-<P2  x="541" y="152" id="9900" />
-<Point x="476" y="121" />
+<P1  x="618" y="138" id="9931" />
+<P2  x="637" y="165" id="9900" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="9939" >
-<father id="9940" num="0" />
-<cdparam x="476" y="121" />
-<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="900" />
-<infoparam name="point " value="null" />
-</SUBCOMPONENT>
-
+</CONNECTOR>
 <CONNECTOR type="115" id="9941" >
-<cdparam x="505" y="218" />
+<cdparam x="601" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="358" y="224" id="9920" />
-<P2  x="243" y="317" id="9916" />
+<P1  x="547" y="244" id="9920" />
+<P2  x="320" y="348" id="9916" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9942" >
-<cdparam x="448" y="278" />
+<cdparam x="544" y="291" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="398" y="264" id="9922" />
-<P2  x="423" y="367" id="9913" />
+<P1  x="587" y="284" id="9922" />
+<P2  x="485" y="347" id="9913" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9943" >
-<cdparam x="585" y="218" />
+<cdparam x="681" y="231" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from select to wait event" value="null" />
-<P1  x="438" y="224" id="9921" />
-<P2  x="560" y="326" id="9910" />
+<P1  x="627" y="244" id="9921" />
+<P2  x="661" y="346" id="9910" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9944" >
-<cdparam x="778" y="153" />
+<cdparam x="874" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from sequence to send event" value="null" />
-<P1  x="590" y="157" id="9905" />
-<P2  x="609" y="191" id="9896" />
+<P1  x="686" y="170" id="9905" />
+<P2  x="686" y="193" id="9896" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9945" >
-<cdparam x="609" y="221" />
+<cdparam x="686" y="221" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from send event to stop state" value="null" />
-<P1  x="609" y="221" id="9897" />
-<P2  x="610" y="238" id="9894" />
+<P1  x="686" y="223" id="9897" />
+<P2  x="686" y="235" id="9894" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9946" >
-<cdparam x="434" y="404" />
+<cdparam x="496" y="384" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="423" y="397" id="9914" />
-<P2  x="435" y="430" id="9891" />
+<P1  x="485" y="377" id="9914" />
+<P2  x="484" y="398" id="9891" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9947" >
-<cdparam x="243" y="347" />
+<cdparam x="320" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="243" y="347" id="9917" />
-<P2  x="243" y="369" id="9887" />
+<P1  x="320" y="378" id="9917" />
+<P2  x="320" y="400" id="9887" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9948" >
-<cdparam x="560" y="356" />
+<cdparam x="658" y="369" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to execI" value="null" />
-<P1  x="560" y="356" id="9911" />
-<P2  x="560" y="378" id="9883" />
+<P1  x="661" y="376" id="9911" />
+<P2  x="658" y="391" id="9883" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9949" >
-<cdparam x="805" y="365" />
+<cdparam x="853" y="376" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to write channel" value="null" />
-<P1  x="805" y="365" id="9908" />
-<P2  x="805" y="387" id="9879" />
+<P1  x="853" y="376" id="9908" />
+<P2  x="853" y="398" id="9879" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9950" >
-<cdparam x="805" y="417" />
+<cdparam x="853" y="428" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from write channel to stop state" value="null" />
-<P1  x="805" y="417" id="9880" />
-<P2  x="806" y="438" id="9877" />
+<P1  x="853" y="428" id="9880" />
+<P2  x="854" y="449" id="9877" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9951" >
-<cdparam x="560" y="418" />
+<cdparam x="658" y="431" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="560" y="418" id="9884" />
-<P2  x="561" y="430" id="9875" />
+<P1  x="658" y="431" id="9884" />
+<P2  x="659" y="443" id="9875" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9952" >
-<cdparam x="435" y="470" />
+<cdparam x="497" y="450" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="435" y="470" id="9892" />
-<P2  x="425" y="478" id="9873" />
+<P1  x="484" y="438" id="9892" />
+<P2  x="485" y="464" id="9873" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9953" >
-<cdparam x="243" y="409" />
+<cdparam x="320" y="440" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from execI to stop state" value="null" />
-<P1  x="243" y="409" id="9888" />
-<P2  x="242" y="430" id="9871" />
+<P1  x="320" y="440" id="9888" />
+<P2  x="319" y="461" id="9871" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9954" >
-<cdparam x="79" y="340" />
+<cdparam x="169" y="368" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from wait event to read channel" value="null" />
-<P1  x="79" y="340" id="9869" />
-<P2  x="78" y="357" id="9865" />
+<P1  x="147" y="380" id="9869" />
+<P2  x="136" y="385" id="9865" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 <CONNECTOR type="115" id="9955" >
-<cdparam x="78" y="387" />
+<cdparam x="168" y="415" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from read channel to stop state" value="null" />
-<P1  x="78" y="387" id="9866" />
-<P2  x="80" y="405" id="9863" />
+<P1  x="136" y="415" id="9866" />
+<P2  x="137" y="457" id="9863" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
 
@@ -23526,8 +23067,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9960" >
-<cdparam x="454" y="451" />
-<sizeparam width="177" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="446" y="451" />
+<sizeparam width="192" 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="recvDataECUN(nbOfSamples)" />
@@ -23539,8 +23080,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9963" >
-<cdparam x="467" y="396" />
-<sizeparam width="167" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="460" y="396" />
+<sizeparam width="181" 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="recvEvtECUN(nbOfSamples)" />
@@ -23553,8 +23094,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9966" >
-<cdparam x="433" y="351" />
-<sizeparam width="224" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="427" y="351" />
+<sizeparam width="236" 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="action state" value="nbOfSamples = (nbOfSamples * 8)/9" />
@@ -23563,8 +23104,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9969" >
-<cdparam x="461" y="283" />
-<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="454" y="283" />
+<sizeparam width="184" 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="read channel" value="dataToECUN(nbOfSamples) " />
@@ -23576,8 +23117,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9972" >
-<cdparam x="464" y="230" />
-<sizeparam width="162" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="458" y="230" />
+<sizeparam width="174" 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="evtToECUN(nbOfSamples) " />
@@ -23599,8 +23140,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="9977" >
-<cdparam x="182" y="451" />
-<sizeparam width="181" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="174" y="451" />
+<sizeparam width="196" 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="dataFromECUN(nbOfSamples)" />
@@ -23612,8 +23153,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="9980" >
-<cdparam x="186" y="400" />
-<sizeparam width="172" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="179" y="400" />
+<sizeparam width="186" 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="evtFromECUN(nbOfSamples)" />
@@ -23626,8 +23167,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1011" id="9983" >
-<cdparam x="156" y="353" />
-<sizeparam width="232" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="150" y="353" />
+<sizeparam width="244" 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="action state" value="nbOfSamples = (nbOfSamples * 9) / 8" />
@@ -23636,8 +23177,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="9986" >
-<cdparam x="178" y="284" />
-<sizeparam width="185" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="170" y="284" />
+<sizeparam width="201" 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="read channel" value="sendDataECUN(nbOfSamples) " />
@@ -23649,8 +23190,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="9989" >
-<cdparam x="182" y="230" />
-<sizeparam width="175" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="174" y="230" />
+<sizeparam width="190" 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="sendEvtECUN(nbOfSamples) " />
@@ -23663,8 +23204,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1030" id="9992" >
-<cdparam x="244" y="96" />
-<sizeparam width="87" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="241" y="96" />
+<sizeparam width="92" 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 ever loop" value="Loop for ever" />
@@ -23711,7 +23252,7 @@ all subblocks
 <cdparam x="328" y="110" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from for ever loop to select" value="null" />
-<P1  x="331" y="110" id="9991" />
+<P1  x="333" y="110" id="9991" />
 <P2  x="424" y="163" id="9993" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -23826,7 +23367,7 @@ all subblocks
 
 <COMPONENT type="301" id="10038" >
 <cdparam x="116" y="561" />
-<sizeparam width="130" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="Sending msg to KM
@@ -23853,8 +23394,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="10041" >
-<cdparam x="253" y="381" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="249" y="381" />
+<sizeparam width="117" 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="doneHSMECUN() " />
@@ -23866,8 +23407,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="10044" >
-<cdparam x="263" y="502" />
-<sizeparam width="108" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="259" y="502" />
+<sizeparam width="117" 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="doneHSMECUN() " />
@@ -23879,8 +23420,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="10047" >
-<cdparam x="235" y="338" />
-<sizeparam width="150" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="229" y="338" />
+<sizeparam width="162" 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="macECUN(nbOfSamples)" />
@@ -23893,8 +23434,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="10050" >
-<cdparam x="222" y="444" />
-<sizeparam width="169" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="215" y="444" />
+<sizeparam width="183" 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="encryptECUN(nbOfSamples)" />
@@ -23907,8 +23448,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1009" id="10053" >
-<cdparam x="224" y="267" />
-<sizeparam width="181" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="216" y="267" />
+<sizeparam width="196" 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="read channel" value="recvDataECUN(nbOfSamples) " />
@@ -23920,8 +23461,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1010" id="10056" >
-<cdparam x="216" y="189" />
-<sizeparam width="171" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="209" y="189" />
+<sizeparam width="185" 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="recvEvtECUN(nbOfSamples) " />
@@ -23934,8 +23475,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1006" id="10059" >
-<cdparam x="258" y="627" />
-<sizeparam width="113" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="253" y="627" />
+<sizeparam width="123" 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="sendDataECUN(1)" />
@@ -23947,8 +23488,8 @@ all subblocks
 </COMPONENT>
 
 <COMPONENT type="1008" id="10062" >
-<cdparam x="261" y="564" />
-<sizeparam width="103" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="256" y="564" />
+<sizeparam width="112" 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="sendEvtECUN(1)" />
@@ -24088,10 +23629,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="10082" >
 <father id="10107" num="0" />
-<cdparam x="1110" y="501" />
-<sizeparam width="213" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="1102" y="501" />
+<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="15" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="0" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSink" />
 <TGConnectingPoint num="0" id="10074" />
 <TGConnectingPoint num="1" id="10075" />
@@ -24143,10 +23684,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="10116" >
 <father id="10141" num="0" />
-<cdparam x="276" y="478" />
-<sizeparam width="228" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="261" y="478" />
+<sizeparam width="246" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="6" minY="0" maxY="66" />
+<cdrectangleparam minX="0" maxX="-12" minY="0" maxY="66" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::LoadSource" />
 <TGConnectingPoint num="0" id="10108" />
 <TGConnectingPoint num="1" id="10109" />
@@ -24196,12 +23737,31 @@ all subblocks
 <attributes byteDataSize="1"  arbitrationPolicy="2"  sliceTime="10000"  pipelineSize="1"  clockRatio="3225"  privacy="0" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1103" id="10150" >
+<SUBCOMPONENT type="1103" id="10159" >
 <father id="10184" num="0" />
+<cdparam x="792" y="486" />
+<sizeparam width="263" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="210" minY="0" maxY="94" />
+<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
+<TGConnectingPoint num="0" id="10151" />
+<TGConnectingPoint num="1" id="10152" />
+<TGConnectingPoint num="2" id="10153" />
+<TGConnectingPoint num="3" id="10154" />
+<TGConnectingPoint num="4" id="10155" />
+<TGConnectingPoint num="5" id="10156" />
+<TGConnectingPoint num="6" id="10157" />
+<TGConnectingPoint num="7" id="10158" />
+<extraparam>
+<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1103" id="10150" >
+<father id="10184" num="1" />
 <cdparam x="595" y="441" />
-<sizeparam width="252" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="270" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="221" minY="0" maxY="94" />
+<cdrectangleparam minX="0" maxX="203" minY="0" maxY="94" />
 <infoparam name="TGComponent" value="KDP Perf Design_NoSec::highPrioLoad" />
 <TGConnectingPoint num="0" id="10142" />
 <TGConnectingPoint num="1" id="10143" />
@@ -24215,25 +23775,6 @@ all subblocks
 <info value="KDP Perf Design_NoSec::highPrioLoad" communicationName="highPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="0" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="10159" >
-<father id="10184" num="1" />
-<cdparam x="799" y="486" />
-<sizeparam width="247" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="226" minY="0" maxY="94" />
-<infoparam name="TGComponent" value="KDP Perf Design_NoSec::lowPrioLoad" />
-<TGConnectingPoint num="0" id="10151" />
-<TGConnectingPoint num="1" id="10152" />
-<TGConnectingPoint num="2" id="10153" />
-<TGConnectingPoint num="3" id="10154" />
-<TGConnectingPoint num="4" id="10155" />
-<TGConnectingPoint num="5" id="10156" />
-<TGConnectingPoint num="6" id="10157" />
-<TGConnectingPoint num="7" id="10158" />
-<extraparam>
-<info value="KDP Perf Design_NoSec::lowPrioLoad" communicationName="lowPrioLoad" referenceCommunicationName="KDP Perf Design_NoSec" priority="1" typeName="channel" />
-</extraparam>
-</SUBCOMPONENT>
 
 <COMPONENT type="1106" id="10209" >
 <cdparam x="362" y="320" />
@@ -24378,31 +23919,31 @@ all subblocks
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="10268" >
+<SUBCOMPONENT type="1101" id="10286" >
 <father id="10311" num="0" />
-<cdparam x="379" y="156" />
-<sizeparam width="315" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="417" y="110" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
-<TGConnectingPoint num="0" id="10260" />
-<TGConnectingPoint num="1" id="10261" />
-<TGConnectingPoint num="2" id="10262" />
-<TGConnectingPoint num="3" id="10263" />
-<TGConnectingPoint num="4" id="10264" />
-<TGConnectingPoint num="5" id="10265" />
-<TGConnectingPoint num="6" id="10266" />
-<TGConnectingPoint num="7" id="10267" />
+<cdrectangleparam minX="0" maxX="100" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
+<TGConnectingPoint num="0" id="10278" />
+<TGConnectingPoint num="1" id="10279" />
+<TGConnectingPoint num="2" id="10280" />
+<TGConnectingPoint num="3" id="10281" />
+<TGConnectingPoint num="4" id="10282" />
+<TGConnectingPoint num="5" id="10283" />
+<TGConnectingPoint num="6" id="10284" />
+<TGConnectingPoint num="7" id="10285" />
 <extraparam>
-<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="10277" >
 <father id="10311" num="1" />
 <cdparam x="416" y="202" />
-<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="234" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="113" minY="0" maxY="133" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="133" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECU1" />
 <TGConnectingPoint num="0" id="10269" />
 <TGConnectingPoint num="1" id="10270" />
@@ -24416,23 +23957,23 @@ all subblocks
 <info value="KDP Perf Design_Sec::CTP_ECU1" taskName="CTP_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="10286" >
+<SUBCOMPONENT type="1101" id="10268" >
 <father id="10311" num="2" />
-<cdparam x="417" y="110" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="368" y="156" />
+<sizeparam width="338" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="112" minY="0" maxY="133" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::App_ECU1" />
-<TGConnectingPoint num="0" id="10278" />
-<TGConnectingPoint num="1" id="10279" />
-<TGConnectingPoint num="2" id="10280" />
-<TGConnectingPoint num="3" id="10281" />
-<TGConnectingPoint num="4" id="10282" />
-<TGConnectingPoint num="5" id="10283" />
-<TGConnectingPoint num="6" id="10284" />
-<TGConnectingPoint num="7" id="10285" />
+<cdrectangleparam minX="0" maxX="-3" minY="0" maxY="133" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::DistributionManager_ECU1" />
+<TGConnectingPoint num="0" id="10260" />
+<TGConnectingPoint num="1" id="10261" />
+<TGConnectingPoint num="2" id="10262" />
+<TGConnectingPoint num="3" id="10263" />
+<TGConnectingPoint num="4" id="10264" />
+<TGConnectingPoint num="5" id="10265" />
+<TGConnectingPoint num="6" id="10266" />
+<TGConnectingPoint num="7" id="10267" />
 <extraparam>
-<info value="KDP Perf Design_Sec::App_ECU1" taskName="App_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+<info value="KDP Perf Design_Sec::DistributionManager_ECU1" taskName="DistributionManager_ECU1" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -24473,10 +24014,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="10320" >
 <father id="10345" num="0" />
-<cdparam x="96" y="119" />
-<sizeparam width="224" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="89" y="119" />
+<sizeparam width="238" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="16" minY="0" maxY="65" />
+<cdrectangleparam minX="0" maxX="2" minY="0" maxY="65" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECU1" />
 <TGConnectingPoint num="0" id="10312" />
 <TGConnectingPoint num="1" id="10313" />
@@ -24634,31 +24175,12 @@ all subblocks
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="10429" >
-<father id="10463" num="0" />
-<cdparam x="946" y="677" />
-<sizeparam width="180" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="128" minY="0" maxY="107" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
-<TGConnectingPoint num="0" id="10421" />
-<TGConnectingPoint num="1" id="10422" />
-<TGConnectingPoint num="2" id="10423" />
-<TGConnectingPoint num="3" id="10424" />
-<TGConnectingPoint num="4" id="10425" />
-<TGConnectingPoint num="5" id="10426" />
-<TGConnectingPoint num="6" id="10427" />
-<TGConnectingPoint num="7" id="10428" />
-<extraparam>
-<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
 <SUBCOMPONENT type="1101" id="10438" >
-<father id="10463" num="1" />
+<father id="10463" num="0" />
 <cdparam x="940" y="724" />
-<sizeparam width="209" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="218" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="99" minY="0" maxY="107" />
+<cdrectangleparam minX="0" maxX="90" minY="0" maxY="107" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_KM" />
 <TGConnectingPoint num="0" id="10430" />
 <TGConnectingPoint num="1" id="10431" />
@@ -24672,6 +24194,25 @@ all subblocks
 <info value="KDP Perf Design_Sec::CTP_KM" taskName="CTP_KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="10429" >
+<father id="10463" num="1" />
+<cdparam x="946" y="677" />
+<sizeparam width="189" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="119" minY="0" maxY="107" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KM" />
+<TGConnectingPoint num="0" id="10421" />
+<TGConnectingPoint num="1" id="10422" />
+<TGConnectingPoint num="2" id="10423" />
+<TGConnectingPoint num="3" id="10424" />
+<TGConnectingPoint num="4" id="10425" />
+<TGConnectingPoint num="5" id="10426" />
+<TGConnectingPoint num="6" id="10427" />
+<TGConnectingPoint num="7" id="10428" />
+<extraparam>
+<info value="KDP Perf Design_Sec::KM" taskName="KM" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
 
 <COMPONENT type="1100" id="10497" >
 <cdparam x="589" y="576" />
@@ -24711,9 +24252,9 @@ all subblocks
 <SUBCOMPONENT type="1101" id="10472" >
 <father id="10497" num="0" />
 <cdparam x="591" y="628" />
-<sizeparam width="211" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="222" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="18" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="7" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_KM" />
 <TGConnectingPoint num="0" id="10464" />
 <TGConnectingPoint num="1" id="10465" />
@@ -24871,12 +24412,31 @@ all subblocks
 <attributes nbOfCores="1" byteDataSize="4"  schedulingPolicy="1"  sliceTime="10000"  goIdleTime="10"  maxConsecutiveIdleCycles="10"  pipelineSize="5"  taskSwitchingTime="20"  branchingPredictionPenalty="2"  cacheMiss="5" execiTime="1" execcTime="1" clockRatio="1" MECType="0" encryption="0"/>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1101" id="10581" >
+<SUBCOMPONENT type="1101" id="10590" >
 <father id="10615" num="0" />
+<cdparam x="1068" y="175" />
+<sizeparam width="288" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="130" />
+<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
+<TGConnectingPoint num="0" id="10582" />
+<TGConnectingPoint num="1" id="10583" />
+<TGConnectingPoint num="2" id="10584" />
+<TGConnectingPoint num="3" id="10585" />
+<TGConnectingPoint num="4" id="10586" />
+<TGConnectingPoint num="5" id="10587" />
+<TGConnectingPoint num="6" id="10588" />
+<TGConnectingPoint num="7" id="10589" />
+<extraparam>
+<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="1101" id="10581" >
+<father id="10615" num="1" />
 <cdparam x="1098" y="224" />
-<sizeparam width="223" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="235" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="60" minY="0" maxY="130" />
+<cdrectangleparam minX="0" maxX="48" minY="0" maxY="130" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::CTP_ECUN" />
 <TGConnectingPoint num="0" id="10573" />
 <TGConnectingPoint num="1" id="10574" />
@@ -24890,25 +24450,6 @@ all subblocks
 <info value="KDP Perf Design_Sec::CTP_ECUN" taskName="CTP_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1101" id="10590" >
-<father id="10615" num="1" />
-<cdparam x="1079" y="175" />
-<sizeparam width="271" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="12" minY="0" maxY="130" />
-<infoparam name="TGComponent" value="KDP Perf Design_Sec::KeyManager_ECUN" />
-<TGConnectingPoint num="0" id="10582" />
-<TGConnectingPoint num="1" id="10583" />
-<TGConnectingPoint num="2" id="10584" />
-<TGConnectingPoint num="3" id="10585" />
-<TGConnectingPoint num="4" id="10586" />
-<TGConnectingPoint num="5" id="10587" />
-<TGConnectingPoint num="6" id="10588" />
-<TGConnectingPoint num="7" id="10589" />
-<extraparam>
-<info value="KDP Perf Design_Sec::KeyManager_ECUN" taskName="KeyManager_ECUN" referenceTaskName="KDP Perf Design_Sec" priority="0" operation="" fatherComponentMECType="0" />
-</extraparam>
-</SUBCOMPONENT>
 
 <COMPONENT type="1100" id="10649" >
 <cdparam x="786" y="88" />
@@ -24947,10 +24488,10 @@ all subblocks
 </COMPONENT>
 <SUBCOMPONENT type="1101" id="10624" >
 <father id="10649" num="0" />
-<cdparam x="791" y="136" />
-<sizeparam width="225" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="781" y="136" />
+<sizeparam width="239" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="9" minY="0" maxY="60" />
+<cdrectangleparam minX="0" maxX="-5" minY="0" maxY="60" />
 <infoparam name="TGComponent" value="KDP Perf Design_Sec::HSM_ECUN" />
 <TGConnectingPoint num="0" id="10616" />
 <TGConnectingPoint num="1" id="10617" />
diff --git a/src/main/java/ui/CheckableLatency.java b/src/main/java/ui/CheckableLatency.java
index c2284840b16f52707f598c17d000b674b5b7188a..e3d42d117c3afac090f35d5aa8c52252d04c07de 100644
--- a/src/main/java/ui/CheckableLatency.java
+++ b/src/main/java/ui/CheckableLatency.java
@@ -41,7 +41,7 @@
 
 
 package ui;
-
+import java.util.HashMap;
 /**
  * Class CheckableLatency
  * Components which can be set as a latency checkpoint
@@ -51,4 +51,5 @@ package ui;
  */
 public interface CheckableLatency  {
 
+
 }
diff --git a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 24bb1877fa967fe1614ee2e7152d80770fba5edd..194a42d376400ea3ab66023f4ba66b160ca9e636 100755
--- a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -1474,6 +1474,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
 									minTimes.add(time);
 								}
 							}
+							System.out.println(transTimes.get(st1) + " " + transTimes.get(st2) + " " + minTimes);
 							if (minTimes.size()>0){
                                     int sum=0;
                                     sl.setMinTime(Integer.toString(Collections.min(minTimes)));
diff --git a/src/main/java/ui/avatarsmd/AvatarSMDReceiveSignal.java b/src/main/java/ui/avatarsmd/AvatarSMDReceiveSignal.java
index 9de291ed75e96c0ece7731843165048df3984d5e..4c8a0abb9737d2aae2c77861a21db96698ed70f0 100644
--- a/src/main/java/ui/avatarsmd/AvatarSMDReceiveSignal.java
+++ b/src/main/java/ui/avatarsmd/AvatarSMDReceiveSignal.java
@@ -51,7 +51,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.geom.Line2D;
 import java.util.LinkedList;
-
+import java.util.HashMap;
 /**
  * Class AvatarSMDReceiveSignal
  * Action of receiving a signal
@@ -66,8 +66,14 @@ public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements C
     protected int arc = 5;
     protected int linebreak = 10;
 	protected int textX1 = 2;
-    
+   
+	private HashMap<String, String> latencyVals;
 	
+	protected int latencyX=30;
+	protected int latencyY=10;
+	protected int textWidth=10;
+	protected int textHeight=20;
+
 	protected int stateOfError = 0; // Not yet checked
     
     public AvatarSMDReceiveSignal(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
@@ -93,8 +99,14 @@ public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements C
         //makeValue();
         
         myImageIcon = IconManager.imgic908;
+		latencyVals = new HashMap<String, String>();
+		latencyVals.put("sendChannel: distanceData", "15");
     }
     
+
+	public void addLatency(String name, String num){
+		latencyVals.put(name,num);
+	}
     public void internalDrawing(Graphics g) {
 		
         int w  = g.getFontMetrics().stringWidth(value + textX1);
@@ -154,9 +166,24 @@ public class AvatarSMDReceiveSignal extends AvatarSMDBasicComponent implements C
 		   
         //g.drawString("sig()", x+(width-w) / 2, y);
         g.drawString(value, x + linebreak + textX1, y + textY);
-		
+		if (getCheckLatency()){
+			drawLatencyInformation(g);
+		}
 		
     }
+	public void drawLatencyInformation(Graphics g){
+		for (String s:latencyVals.keySet()){
+			int w  = g.getFontMetrics().stringWidth(s);
+			g.drawString(s, x-latencyX-w+1, y-latencyY-2);
+			g.drawRect(x-latencyX-w, y-latencyY-textHeight, w+4, textHeight); 
+			g.drawLine(x,y,x-latencyX, y-latencyY);
+			Color c = g.getColor();
+			g.setColor(Color.ORANGE);
+			g.drawString(latencyVals.get(s), x-latencyX/2, y-latencyY/2);
+			g.setColor(c);
+		}
+	}
+
     
     public TGComponent isOnMe(int _x, int _y) {
         if (GraphicLib.isInRectangle(_x, _y, x, y, width, height)) {
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index 1a312e6b3dcd543e7cc2b25189db9287eb4ee915..914f1329c1191a331ff45e4b12853d561069982d 100755
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -985,8 +985,8 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
         jspLatency = new JScrollPane(latTable);
         jspLatency.setWheelScrollingEnabled(true);
         jspLatency.getVerticalScrollBar().setUnitIncrement(10);
-        jspLatency.setMinimumSize(new Dimension(400, 250));
-        jspLatency.setPreferredSize(new Dimension(1400, 250));
+        jspLatency.setMinimumSize(new Dimension(1000, 250));
+        jspLatency.setPreferredSize(new Dimension(2100, 250));
         latencyPanel.add(jspLatency, c0);
 
 
diff --git a/src/main/java/ui/tmlad/TMLADReadChannel.java b/src/main/java/ui/tmlad/TMLADReadChannel.java
index a0d5002a7148054ca6fce017c2c86a4e7e7d4f45..6992df5278f4a0e24ab2c3375736babccfc18901 100755
--- a/src/main/java/ui/tmlad/TMLADReadChannel.java
+++ b/src/main/java/ui/tmlad/TMLADReadChannel.java
@@ -53,7 +53,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.geom.Line2D;
 import java.util.ArrayList;
-
+import java.util.HashMap;
 /**
    * Class TMLADReadChannel
    * Action of writting data in channel
@@ -62,6 +62,7 @@ import java.util.ArrayList;
    * @author Ludovic APVRILLE
  */
 public class TMLADReadChannel extends TGCWithoutInternalComponent implements CheckableAccessibility, CheckableLatency, EmbeddedComment, AllowedBreakpoint, BasicErrorHighlight {
+	private HashMap<String, String> latencyVals;
     protected int lineLength = 5;
     protected int textX =  5;
     protected int textX0 =  2;
@@ -69,6 +70,11 @@ public class TMLADReadChannel extends TGCWithoutInternalComponent implements Che
     protected int textY1 =  15;
     protected int linebreak = 10;
 
+	protected int latencyX=30;
+	protected int latencyY=10;
+	protected int textWidth=10;
+	protected int textHeight=20;
+
     protected String channelName = "ch";
     protected String nbOfSamples= "1";
     public String securityContext ="";
@@ -80,6 +86,7 @@ public class TMLADReadChannel extends TGCWithoutInternalComponent implements Che
 
     public int reachabilityInformation;
 
+
     public TMLADReadChannel(int _x, int _y, int _minX, int _maxX, int _minY, int _maxY, boolean _pos, TGComponent _father, TDiagramPanel _tdp)  {
         super(_x, _y, _minX, _maxX, _minY, _maxY, _pos, _father, _tdp);
 
@@ -100,8 +107,14 @@ public class TMLADReadChannel extends TGCWithoutInternalComponent implements Che
         name = "read channel";
 
         myImageIcon = IconManager.imgic906;
+		latencyVals = new HashMap<String, String>();
+		latencyVals.put("sendChannel: distanceData", "3");
+
     }
 
+	public void addLatency(String name, String num){
+		latencyVals.put(name,num);
+	}
     public void internalDrawing(Graphics g) {
         int w  = g.getFontMetrics().stringWidth(value);
         int w1 = Math.max(minWidth, w + 2 * textX);
@@ -156,10 +169,21 @@ public class TMLADReadChannel extends TGCWithoutInternalComponent implements Che
 	if (!securityContext.equals("")){
 	    g.drawString("sec:"+securityContext, x+3*width/4, y+height+textY1);
 	}
-	drawReachabilityInformation(g);
-
+		drawReachabilityInformation(g);
+		if (getCheckLatency()){
+			drawLatencyInformation(g);	
+		}
     }
 
+	public void drawLatencyInformation(Graphics g){
+		for (String s:latencyVals.keySet()){
+			int w  = g.getFontMetrics().stringWidth(s);
+			g.drawString(s, x-latencyX-w+1, y-latencyY-2);
+			g.drawRect(x-latencyX-w, y-latencyY-textHeight, w+4, textHeight); 
+			g.drawLine(x,y,x-latencyX, y-latencyY);
+			g.drawString(latencyVals.get(s), x-latencyX/2, y-latencyY/2);
+		}
+	}
 
     public void drawReachabilityInformation(Graphics g) {
         if (reachabilityInformation > 0) {