diff --git a/modeling/SysMLSec/SysMLSecTutorial.xml b/modeling/SysMLSec/SysMLSecTutorial.xml
index 646cae2169cf6c263e5dfadb10e6b50af0b09b7e..51c21474a272d19ec6f26f08abd4898ce0735ae8 100644
--- a/modeling/SysMLSec/SysMLSecTutorial.xml
+++ b/modeling/SysMLSec/SysMLSecTutorial.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="7" LAST_SELECTED_SUB_TAB="0">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="true" ACTIVATE_PENALTIES="false" UPDATE_INFORMATION_DIPLO_SIM="true" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="3" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="Sysmlsec Methodology" nameTab="SysMLSec_Methodology" >
 <SysmlsecMethodologyDiagramPanel name="SysMLSec_Methodology" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
@@ -192,13 +192,13 @@
 <TGConnectingPoint num="19" id="134" />
 <TGConnectingPoint num="20" id="135" />
 </COMPONENT>
-<SUBCOMPONENT type="5707" id="112" index="23" uid="faf8a9c6-abd0-4394-b69e-bc2bb622ac93" >
+<SUBCOMPONENT type="5707" id="112" index="23" uid="1370a96e-0d89-48c4-a29b-0a049e868e13" >
 <father id="136" num="0" />
-<cdparam x="818" y="267" />
+<cdparam x="818" y="297" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="905" maxX="905" minY="265" maxY="265" />
-<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
+<cdrectangleparam minX="905" maxX="905" minY="295" maxY="295" />
+<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5707" id="113" index="24" uid="a75435a4-67d9-4be4-a579-68815106caeb" >
@@ -210,13 +210,13 @@
 <infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="114" index="25" uid="1370a96e-0d89-48c4-a29b-0a049e868e13" >
+<SUBCOMPONENT type="5707" id="114" index="25" uid="faf8a9c6-abd0-4394-b69e-bc2bb622ac93" >
 <father id="136" num="2" />
-<cdparam x="818" y="297" />
+<cdparam x="818" y="267" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="905" maxX="905" minY="295" maxY="295" />
-<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
+<cdrectangleparam minX="905" maxX="905" minY="265" maxY="265" />
+<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
 
@@ -249,13 +249,13 @@
 <TGConnectingPoint num="19" id="159" />
 <TGConnectingPoint num="20" id="160" />
 </COMPONENT>
-<SUBCOMPONENT type="5707" id="137" index="26" uid="02e527d6-856a-40b4-b8a3-2a10e74fa930" >
+<SUBCOMPONENT type="5707" id="137" index="26" uid="3beb2cdc-16ad-4be0-beb5-d5589509c270" >
 <father id="161" num="0" />
-<cdparam x="1155" y="141" />
+<cdparam x="1155" y="171" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
-<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
+<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
+<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5707" id="138" index="27" uid="93271dfb-16c3-4c66-8b66-e66c40f2fdd6" >
@@ -267,13 +267,13 @@
 <infoparam name="value " value="SecureArchitectureWithNonSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="139" index="28" uid="3beb2cdc-16ad-4be0-beb5-d5589509c270" >
+<SUBCOMPONENT type="5707" id="139" index="28" uid="02e527d6-856a-40b4-b8a3-2a10e74fa930" >
 <father id="161" num="2" />
-<cdparam x="1155" y="171" />
+<cdparam x="1155" y="141" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="1155" maxX="1155" minY="170" maxY="170" />
-<infoparam name="value " value="NonSecureArchitectureWithSecureFV" />
+<cdrectangleparam minX="1155" maxX="1155" minY="140" maxY="140" />
+<infoparam name="value " value="NonSecureArchitectureWithNonSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
 
@@ -306,22 +306,22 @@
 <TGConnectingPoint num="19" id="183" />
 <TGConnectingPoint num="20" id="184" />
 </COMPONENT>
-<SUBCOMPONENT type="5707" id="162" index="29" uid="ce6c8db0-5c95-400b-a68a-a80af90eb337" >
+<SUBCOMPONENT type="5707" id="162" index="29" uid="f9282079-9523-430f-9a47-a23e2645f6aa" >
 <father id="185" num="0" />
-<cdparam x="655" y="140" />
+<cdparam x="655" y="155" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
-<infoparam name="value " value="NonSecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
+<infoparam name="value " value="SecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5707" id="163" index="30" uid="f9282079-9523-430f-9a47-a23e2645f6aa" >
+<SUBCOMPONENT type="5707" id="163" index="30" uid="ce6c8db0-5c95-400b-a68a-a80af90eb337" >
 <father id="185" num="1" />
-<cdparam x="655" y="155" />
+<cdparam x="655" y="140" />
 <sizeparam width="10" height="10" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="655" maxX="655" minY="155" maxY="155" />
-<infoparam name="value " value="SecureFV" />
+<cdrectangleparam minX="655" maxX="655" minY="140" maxY="140" />
+<infoparam name="value " value="NonSecureFV" />
 <new d="false" />
 </SUBCOMPONENT>
 
@@ -1053,16 +1053,16 @@
 <Modeling type="TML Component Design" nameTab="NonSecureFV" tabs="TML Component Task Diagram$T2$T1" >
 <TMLComponentTaskDiagramPanel name="TML Component Task Diagram" minX="10" maxX="2500" minY="10" maxY="1500" channels="true" events="true" requests="true" considerExecOperators="true" considerTimingOperators="true" zoom="1.0" >
 <CONNECTOR type="126" id="543" index="0" uid="635927ff-f265-44c1-9fb3-bce3e059b9a4" >
-<cdparam x="419" y="198" />
+<cdparam x="505" y="300" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="406" y="185" id="555" />
-<P2  x="565" y="185" id="544" />
+<P1  x="505" y="300" id="555" />
+<P2  x="597" y="301" id="544" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
 </CONNECTOR>
 <COMPONENT type="1202" id="554" index="1" uid="e4cc3c45-2a2a-48f9-9648-cf634cb268d7" >
-<cdparam x="565" y="132" />
+<cdparam x="610" y="235" />
 <sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -1083,7 +1083,7 @@
 <SUBCOMPONENT type="1203" id="545" index="3" uid="fdd0289d-b618-4931-9cba-a88e20066247" >
 <father id="554" num="0" />
 <reference id="416" />
-<cdparam x="552" y="185" />
+<cdparam x="597" y="288" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
@@ -1091,7 +1091,7 @@
 <new d="false" />
 <TGConnectingPoint num="0" id="544" />
 <extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
+<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1101,7 +1101,7 @@
 </SUBCOMPONENT>
 
 <COMPONENT type="1202" id="565" index="2" uid="c85f17f8-5408-49d7-bd1a-4bfcbb49834c" >
-<cdparam x="206" y="130" />
+<cdparam x="292" y="232" />
 <sizeparam width="200" height="150" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
@@ -1122,7 +1122,7 @@
 <SUBCOMPONENT type="1203" id="556" index="4" uid="b332c7c7-89d5-4b2e-8322-d75e510fecde" >
 <father id="565" num="0" />
 <reference id="416" />
-<cdparam x="393" y="185" />
+<cdparam x="479" y="287" />
 <sizeparam width="26" height="26" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="-13" maxX="187" minY="-13" maxY="137" />
@@ -1302,9 +1302,9 @@
 <SUBCOMPONENT type="1103" id="592" index="7" uid="a65d76c2-6824-4deb-9505-6147202d36f0" >
 <father id="617" num="0" />
 <cdparam x="614" y="545" />
-<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="52" minY="0" maxY="99" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
 <infoparam name="TGComponent" value="NonSecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="584" />
@@ -1359,9 +1359,9 @@
 <SUBCOMPONENT type="1103" id="626" index="8" uid="41128a9f-2f01-44b0-9030-90c1b8e6163a" >
 <father id="651" num="0" />
 <cdparam x="609" y="398" />
-<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="97" minY="0" maxY="56" />
+<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
 <infoparam name="TGComponent" value="NonSecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="618" />
@@ -1416,9 +1416,9 @@
 <SUBCOMPONENT type="1101" id="660" index="9" uid="59517a11-a754-4d48-bea2-fb47e6f44706" >
 <father id="685" num="0" />
 <cdparam x="933" y="219" />
-<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="NonSecureFV::T2" />
 <new d="false" />
 <TGConnectingPoint num="0" id="652" />
@@ -1473,9 +1473,9 @@
 <SUBCOMPONENT type="1101" id="694" index="10" uid="f5e82e77-56ed-47bb-b087-809dc72e68dc" >
 <father id="719" num="0" />
 <cdparam x="288" y="213" />
-<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="NonSecureFV::T1" />
 <new d="false" />
 <TGConnectingPoint num="0" id="686" />
@@ -1579,9 +1579,9 @@
 <SUBCOMPONENT type="1103" id="731" index="7" uid="eb26aaff-030f-4330-a093-dc9fdb7c0fc5" >
 <father id="756" num="0" />
 <cdparam x="616" y="563" />
-<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="52" minY="0" maxY="99" />
+<cdrectangleparam minX="0" maxX="41" minY="0" maxY="99" />
 <infoparam name="TGComponent" value="NonSecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="723" />
@@ -1636,9 +1636,9 @@
 <SUBCOMPONENT type="1103" id="765" index="8" uid="7a57b30e-5089-4cbf-b78d-4dcf9d5463c3" >
 <father id="790" num="0" />
 <cdparam x="609" y="398" />
-<sizeparam width="153" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="164" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="97" minY="0" maxY="56" />
+<cdrectangleparam minX="0" maxX="86" minY="0" maxY="56" />
 <infoparam name="TGComponent" value="NonSecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="757" />
@@ -1693,9 +1693,9 @@
 <SUBCOMPONENT type="1101" id="799" index="9" uid="9d476f54-2428-45df-85e7-1af4892ceb05" >
 <father id="824" num="0" />
 <cdparam x="933" y="219" />
-<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="NonSecureFV::T2" />
 <new d="false" />
 <TGConnectingPoint num="0" id="791" />
@@ -1750,9 +1750,9 @@
 <SUBCOMPONENT type="1101" id="833" index="10" uid="8ebaea4c-20ed-4c7e-94e0-21f6616b4a53" >
 <father id="858" num="0" />
 <cdparam x="288" y="213" />
-<sizeparam width="134" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="142" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="116" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="108" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="NonSecureFV::T1" />
 <new d="false" />
 <TGConnectingPoint num="0" id="825" />
@@ -1821,8 +1821,8 @@
 <cdparam x="419" y="198" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="Connector between ports" />
-<P1  x="419" y="198" id="874" />
-<P2  x="570" y="198" id="863" />
+<P1  x="406" y="185" id="874" />
+<P2  x="583" y="185" id="863" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
 </CONNECTOR>
@@ -1856,7 +1856,7 @@
 <new d="false" />
 <TGConnectingPoint num="0" id="863" />
 <extraparam>
-<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="comm" commType="0" origin="false" finite="false" blocking="true" maxSamples="8" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="false" checkConfStatus="0" checkAuth="true" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -1895,7 +1895,7 @@
 <new d="false" />
 <TGConnectingPoint num="0" id="874" />
 <extraparam>
-<Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="80" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="1" checkStrongAuthStatus="1" vc="0" />
+<Prop commName="comm" commType="0" origin="true" finite="false" blocking="true" maxSamples="80" widthSamples="40" isLossy="false" isPrex="false" isPostex="false" lossPercentage="0" maxNbOfLoss="0" dataFlowType="int16_t" associatedEvent="" checkConf="true" checkConfStatus="1" checkAuth="false" checkWeakAuthStatus="0" checkStrongAuthStatus="0" vc="0" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
 <Type type="0" typeOther="" />
@@ -2112,13 +2112,13 @@
 <attributes byteDataSize="4"  memorySize="1024"  clockRatio="1"  bufferType="0" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="1111" id="919" index="7" uid="0acfc1db-b1b2-414f-8921-97e25a1dfdee" >
+<SUBCOMPONENT type="1103" id="919" index="7" uid="ec253bf8-8c3e-4999-a477-62fa04920940" >
 <father id="953" num="0" />
-<cdparam x="599" y="584" />
-<sizeparam width="95" height="39" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="590" y="530" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="178" minY="0" maxY="105" />
-<infoparam name="TGComponent" value="Cipherdata" />
+<cdrectangleparam minX="0" maxX="134" minY="0" maxY="104" />
+<infoparam name="TGComponent" value="SecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="911" />
 <TGConnectingPoint num="1" id="912" />
@@ -2129,16 +2129,16 @@
 <TGConnectingPoint num="6" id="917" />
 <TGConnectingPoint num="7" id="918" />
 <extraparam>
-<info value="Cipherdata" referenceKeyName="Cipherdata" priority="5" typeName="key" />
+<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1103" id="928" index="8" uid="ec253bf8-8c3e-4999-a477-62fa04920940" >
+<SUBCOMPONENT type="1111" id="928" index="8" uid="0acfc1db-b1b2-414f-8921-97e25a1dfdee" >
 <father id="953" num="1" />
-<cdparam x="590" y="530" />
-<sizeparam width="130" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="599" y="584" />
+<sizeparam width="95" height="39" minWidth="75" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="143" minY="0" maxY="104" />
-<infoparam name="TGComponent" value="SecureFV::comm" />
+<cdrectangleparam minX="0" maxX="178" minY="0" maxY="105" />
+<infoparam name="TGComponent" value="Cipherdata" />
 <new d="false" />
 <TGConnectingPoint num="0" id="920" />
 <TGConnectingPoint num="1" id="921" />
@@ -2149,7 +2149,7 @@
 <TGConnectingPoint num="6" id="926" />
 <TGConnectingPoint num="7" id="927" />
 <extraparam>
-<info value="SecureFV::comm" communicationName="comm" referenceCommunicationName="SecureFV" mappedElements="" priority="0" typeName="channel" />
+<info value="Cipherdata" referenceKeyName="Cipherdata" priority="5" typeName="key" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2192,9 +2192,9 @@
 <SUBCOMPONENT type="1103" id="962" index="9" uid="9b5c33fe-67af-4022-8f1e-e0a61f6d2a2e" >
 <father id="987" num="0" />
 <cdparam x="611" y="393" />
-<sizeparam width="130" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="120" minY="0" maxY="56" />
+<cdrectangleparam minX="0" maxX="111" minY="0" maxY="56" />
 <infoparam name="TGComponent" value="SecureFV::comm" />
 <new d="false" />
 <TGConnectingPoint num="0" id="954" />
@@ -2249,9 +2249,9 @@
 <SUBCOMPONENT type="1101" id="996" index="10" uid="2f2b12e7-e1b6-42e1-9a2d-ae3ab34499d0" >
 <father id="1021" num="0" />
 <cdparam x="918" y="206" />
-<sizeparam width="111" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="139" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="SecureFV::T2" />
 <new d="false" />
 <TGConnectingPoint num="0" id="988" />
@@ -2306,9 +2306,9 @@
 <SUBCOMPONENT type="1101" id="1030" index="11" uid="4b0bf450-dc51-4da8-b0b5-65544926c745" >
 <father id="1055" num="0" />
 <cdparam x="290" y="207" />
-<sizeparam width="111" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="117" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="139" minY="0" maxY="160" />
+<cdrectangleparam minX="0" maxX="133" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="SecureFV::T1" />
 <new d="false" />
 <TGConnectingPoint num="0" id="1022" />
@@ -2371,7 +2371,7 @@
 
 
 
-<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1$Block$Block" >
+<Modeling type="AVATAR Design" nameTab="SecurityMechanismDesign" tabs="Block Diagram$System$T2$T1" >
 <AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="1900" minY="10" maxY="900" zoom="1.0" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
@@ -2380,263 +2380,15 @@
 <Validated value="" />
 <Ignored value="" />
 
-<COMPONENT type="5003" id="1067" index="0" uid="f597a960-58fc-4421-a1b3-cff6f8a83853" >
-<cdparam x="450" y="340" />
-<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="DataType" value="Key" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1059" />
-<TGConnectingPoint num="1" id="1060" />
-<TGConnectingPoint num="2" id="1061" />
-<TGConnectingPoint num="3" id="1062" />
-<TGConnectingPoint num="4" id="1063" />
-<TGConnectingPoint num="5" id="1064" />
-<TGConnectingPoint num="6" id="1065" />
-<TGConnectingPoint num="7" id="1066" />
-<extraparam>
-<Attribute access="2" id="data" value="0" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5003" id="1076" index="1" uid="e806e800-876c-4300-afa9-799548be8133" >
-<cdparam x="50" y="340" />
-<sizeparam width="200" height="100" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="DataType" value="Message" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1068" />
-<TGConnectingPoint num="1" id="1069" />
-<TGConnectingPoint num="2" id="1070" />
-<TGConnectingPoint num="3" id="1071" />
-<TGConnectingPoint num="4" id="1072" />
-<TGConnectingPoint num="5" id="1073" />
-<TGConnectingPoint num="6" id="1074" />
-<TGConnectingPoint num="7" id="1075" />
-<extraparam>
-<Attribute access="2" id="data" value="0" type="8" typeOther="" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="302" id="1093" index="2" uid="36d17f8a-ca5c-43c6-9d8e-d0849f29aa15" >
-<cdparam x="410" y="140" />
-<sizeparam width="251" height="1" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Proverif Pragma" value="#Confidentiality T1.comm_chData 
-#Confidentiality T1.Cipherdata 
-" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1077" />
-<TGConnectingPoint num="1" id="1078" />
-<TGConnectingPoint num="2" id="1079" />
-<TGConnectingPoint num="3" id="1080" />
-<TGConnectingPoint num="4" id="1081" />
-<TGConnectingPoint num="5" id="1082" />
-<TGConnectingPoint num="6" id="1083" />
-<TGConnectingPoint num="7" id="1084" />
-<TGConnectingPoint num="8" id="1085" />
-<TGConnectingPoint num="9" id="1086" />
-<TGConnectingPoint num="10" id="1087" />
-<TGConnectingPoint num="11" id="1088" />
-<TGConnectingPoint num="12" id="1089" />
-<TGConnectingPoint num="13" id="1090" />
-<TGConnectingPoint num="14" id="1091" />
-<TGConnectingPoint num="15" id="1092" />
-<extraparam>
-<Line value="#Confidentiality T1.comm_chData " />
-<Line value="#Confidentiality T1.Cipherdata " />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="5002" id="1095" index="3" uid="de75917b-0b14-4c88-85cb-f76c112c259f" >
-<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="1094" />
-<P1  x="206" y="130" id="1096" />
-<P2  x="583" y="132" id="1137" />
-<AutomaticDrawing  data="true" />
-<new d="false" />
-<extraparam>
-<isd value="in comm(int SecureFV__comm_chData)" />
-<oso value="out comm(int comm_chData)" />
-<FIFOType asynchronous="true" synchronousCH="false" size="40" blocking="true" private="false" broadcast="false" lossy="false" ams="false" />
-</extraparam>
-</CONNECTOR>
-<COMPONENT type="5000" id="1136" index="4" uid="bfc342b9-45b2-4cdd-8c35-139db47aafa7" >
-<cdparam x="206" y="130" />
-<sizeparam width="200" height="150" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Block" value="T1" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1096" />
-<TGConnectingPoint num="1" id="1097" />
-<TGConnectingPoint num="2" id="1098" />
-<TGConnectingPoint num="3" id="1099" />
-<TGConnectingPoint num="4" id="1100" />
-<TGConnectingPoint num="5" id="1101" />
-<TGConnectingPoint num="6" id="1102" />
-<TGConnectingPoint num="7" id="1103" />
-<TGConnectingPoint num="8" id="1104" />
-<TGConnectingPoint num="9" id="1105" />
-<TGConnectingPoint num="10" id="1106" />
-<TGConnectingPoint num="11" id="1107" />
-<TGConnectingPoint num="12" id="1108" />
-<TGConnectingPoint num="13" id="1109" />
-<TGConnectingPoint num="14" id="1110" />
-<TGConnectingPoint num="15" id="1111" />
-<TGConnectingPoint num="16" id="1112" />
-<TGConnectingPoint num="17" id="1113" />
-<TGConnectingPoint num="18" id="1114" />
-<TGConnectingPoint num="19" id="1115" />
-<TGConnectingPoint num="20" id="1116" />
-<TGConnectingPoint num="21" id="1117" />
-<TGConnectingPoint num="22" id="1118" />
-<TGConnectingPoint num="23" id="1119" />
-<TGConnectingPoint num="24" id="1120" />
-<TGConnectingPoint num="25" id="1121" />
-<TGConnectingPoint num="26" id="1122" />
-<TGConnectingPoint num="27" id="1123" />
-<TGConnectingPoint num="28" id="1124" />
-<TGConnectingPoint num="29" id="1125" />
-<TGConnectingPoint num="30" id="1126" />
-<TGConnectingPoint num="31" id="1127" />
-<TGConnectingPoint num="32" id="1128" />
-<TGConnectingPoint num="33" id="1129" />
-<TGConnectingPoint num="34" id="1130" />
-<TGConnectingPoint num="35" id="1131" />
-<TGConnectingPoint num="36" id="1132" />
-<TGConnectingPoint num="37" id="1133" />
-<TGConnectingPoint num="38" id="1134" />
-<TGConnectingPoint num="39" id="1135" />
-<extraparam>
-<blockType data="cryptoblock" color="-4072719" />
-<CryptoBlock value="true" />
-<Attribute access="0" id="comm_chData" value="0" type="0" typeOther="" />
-<Attribute access="0" id="tmp" value="0" type="0" typeOther="" />
-<Attribute access="0" id="loop_index" value="0" type="0" typeOther="" />
-<Attribute access="0" id="Cipherdata" value="0" type="0" typeOther="" />
-<Attribute access="0" id="Cipherdata_encrypted" value="0" type="0" typeOther="" />
-<Attribute access="0" id="key_Cipherdata" value="0" type="0" typeOther="" />
-<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="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-<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="int sencrypt(int Cipherdata, int key_Cipherdata)" />
-<Signal value="out comm(int comm_chData)" attached="false" />
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5000" id="1177" index="5" uid="d5f8e037-89d3-4076-a6b2-74c8e376871a" >
-<cdparam x="583" y="132" />
-<sizeparam width="200" height="150" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
-<infoparam name="Block" value="T2" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1137" />
-<TGConnectingPoint num="1" id="1138" />
-<TGConnectingPoint num="2" id="1139" />
-<TGConnectingPoint num="3" id="1140" />
-<TGConnectingPoint num="4" id="1141" />
-<TGConnectingPoint num="5" id="1142" />
-<TGConnectingPoint num="6" id="1143" />
-<TGConnectingPoint num="7" id="1144" />
-<TGConnectingPoint num="8" id="1145" />
-<TGConnectingPoint num="9" id="1146" />
-<TGConnectingPoint num="10" id="1147" />
-<TGConnectingPoint num="11" id="1148" />
-<TGConnectingPoint num="12" id="1149" />
-<TGConnectingPoint num="13" id="1150" />
-<TGConnectingPoint num="14" id="1151" />
-<TGConnectingPoint num="15" id="1152" />
-<TGConnectingPoint num="16" id="1153" />
-<TGConnectingPoint num="17" id="1154" />
-<TGConnectingPoint num="18" id="1155" />
-<TGConnectingPoint num="19" id="1156" />
-<TGConnectingPoint num="20" id="1157" />
-<TGConnectingPoint num="21" id="1158" />
-<TGConnectingPoint num="22" id="1159" />
-<TGConnectingPoint num="23" id="1160" />
-<TGConnectingPoint num="24" id="1161" />
-<TGConnectingPoint num="25" id="1162" />
-<TGConnectingPoint num="26" id="1163" />
-<TGConnectingPoint num="27" id="1164" />
-<TGConnectingPoint num="28" id="1165" />
-<TGConnectingPoint num="29" id="1166" />
-<TGConnectingPoint num="30" id="1167" />
-<TGConnectingPoint num="31" id="1168" />
-<TGConnectingPoint num="32" id="1169" />
-<TGConnectingPoint num="33" id="1170" />
-<TGConnectingPoint num="34" id="1171" />
-<TGConnectingPoint num="35" id="1172" />
-<TGConnectingPoint num="36" id="1173" />
-<TGConnectingPoint num="37" id="1174" />
-<TGConnectingPoint num="38" id="1175" />
-<TGConnectingPoint num="39" id="1176" />
-<extraparam>
-<blockType data="cryptoblock" color="-4072719" />
-<CryptoBlock value="true" />
-<Attribute access="0" id="SecureFV__comm_chData" value="0" type="0" typeOther="" />
-<Attribute access="0" id="tmp" value="0" type="0" typeOther="" />
-<Attribute access="0" id="loop_index" value="0" type="0" typeOther="" />
-<Attribute access="0" id="Cipherdata_encrypted" value="0" type="0" typeOther="" />
-<Attribute access="0" id="Cipherdata" value="0" type="0" typeOther="" />
-<Attribute access="0" id="key_Cipherdata" value="0" type="0" typeOther="" />
-<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="Message sencrypt(Message msg, Key k)" />
-<Method value="Message sdecrypt(Message msg, Key k)" />
-<Method value="Key DH(Key pubK, Key privK)" />
-<Method value="Message hash(Message msg)" />
-<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="int sdecrypt(int Cipherdata_encrypted, int key_Cipherdata)" />
-<Signal value="in comm(int SecureFV__comm_chData)" attached="false" />
-</extraparam>
-</COMPONENT>
-
-<CONNECTOR type="5002" id="1183" index="6" uid="57bf5a29-2794-4791-9381-5ae9ec79989a" >
+<CONNECTOR type="5002" id="1064" index="0" uid="57bf5a29-2794-4791-9381-5ae9ec79989a" >
 <cdparam x="568" y="109" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block0 to Block0" value="" />
-<TGConnectingPoint num="0" id="1180" />
-<TGConnectingPoint num="1" id="1181" />
-<TGConnectingPoint num="2" id="1182" />
-<P1  x="459" y="88" id="1312" />
-<P2  x="459" y="143" id="1305" />
+<TGConnectingPoint num="0" id="1061" />
+<TGConnectingPoint num="1" id="1062" />
+<TGConnectingPoint num="2" id="1063" />
+<P1  x="459" y="88" id="1193" />
+<P2  x="459" y="143" id="1186" />
 <Point x="490" y="88" />
 <Point x="490" y="143" />
 <AutomaticDrawing  data="true" />
@@ -2646,8 +2398,8 @@
 <osd value="out chout(Message msg)" />
 <FIFOType asynchronous="false" synchronousCH="true" size="1" blocking="false" private="false" broadcast="false" lossy="false" ams="false" />
 </extraparam>
-</CONNECTOR><SUBCOMPONENT type="-1" id="1178" index="11" uid="3c00520f-5ad9-4ce4-a254-242a4e994208" >
-<father id="1183" num="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1059" index="5" uid="3c00520f-5ad9-4ce4-a254-242a4e994208" >
+<father id="1064" num="0" />
 <cdparam x="490" y="88" />
 <sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2655,8 +2407,8 @@
 <infoparam name="point " value="null" />
 <new d="false" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="-1" id="1179" index="12" uid="4b38daa0-222b-49e0-b12b-1278f4f4a2cd" >
-<father id="1183" num="1" />
+<SUBCOMPONENT type="-1" id="1060" index="6" uid="4b38daa0-222b-49e0-b12b-1278f4f4a2cd" >
+<father id="1064" num="1" />
 <cdparam x="490" y="143" />
 <sizeparam width="8" height="8" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -2665,9 +2417,9 @@
 <new d="false" />
 </SUBCOMPONENT>
 
-<COMPONENT type="302" id="1200" index="7" uid="12bc1e8f-c160-40b5-9c76-535083b73fe1" >
+<COMPONENT type="302" id="1081" index="1" uid="12bc1e8f-c160-40b5-9c76-535083b73fe1" >
 <cdparam x="517" y="43" />
-<sizeparam width="260" height="66" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="274" height="66" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Proverif Pragma" value="#InitialSystemKnowledge T1.sk T2.sk
@@ -2675,22 +2427,22 @@
 #Confidentiality T1.secretData
 " />
 <new d="false" />
-<TGConnectingPoint num="0" id="1184" />
-<TGConnectingPoint num="1" id="1185" />
-<TGConnectingPoint num="2" id="1186" />
-<TGConnectingPoint num="3" id="1187" />
-<TGConnectingPoint num="4" id="1188" />
-<TGConnectingPoint num="5" id="1189" />
-<TGConnectingPoint num="6" id="1190" />
-<TGConnectingPoint num="7" id="1191" />
-<TGConnectingPoint num="8" id="1192" />
-<TGConnectingPoint num="9" id="1193" />
-<TGConnectingPoint num="10" id="1194" />
-<TGConnectingPoint num="11" id="1195" />
-<TGConnectingPoint num="12" id="1196" />
-<TGConnectingPoint num="13" id="1197" />
-<TGConnectingPoint num="14" id="1198" />
-<TGConnectingPoint num="15" id="1199" />
+<TGConnectingPoint num="0" id="1065" />
+<TGConnectingPoint num="1" id="1066" />
+<TGConnectingPoint num="2" id="1067" />
+<TGConnectingPoint num="3" id="1068" />
+<TGConnectingPoint num="4" id="1069" />
+<TGConnectingPoint num="5" id="1070" />
+<TGConnectingPoint num="6" id="1071" />
+<TGConnectingPoint num="7" id="1072" />
+<TGConnectingPoint num="8" id="1073" />
+<TGConnectingPoint num="9" id="1074" />
+<TGConnectingPoint num="10" id="1075" />
+<TGConnectingPoint num="11" id="1076" />
+<TGConnectingPoint num="12" id="1077" />
+<TGConnectingPoint num="13" id="1078" />
+<TGConnectingPoint num="14" id="1079" />
+<TGConnectingPoint num="15" id="1080" />
 <extraparam>
 <Line value="#InitialSystemKnowledge T1.sk T2.sk" />
 <Line value="" />
@@ -2698,93 +2450,93 @@
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="1209" index="8" uid="c53b882a-3bdd-42ec-b942-b9febe1ac229" >
+<COMPONENT type="5003" id="1090" index="2" uid="c53b882a-3bdd-42ec-b942-b9febe1ac229" >
 <cdparam x="260" y="262" />
-<sizeparam width="129" height="61" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="124" height="71" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="DataType0" value="Message" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1201" />
-<TGConnectingPoint num="1" id="1202" />
-<TGConnectingPoint num="2" id="1203" />
-<TGConnectingPoint num="3" id="1204" />
-<TGConnectingPoint num="4" id="1205" />
-<TGConnectingPoint num="5" id="1206" />
-<TGConnectingPoint num="6" id="1207" />
-<TGConnectingPoint num="7" id="1208" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
+<TGConnectingPoint num="2" id="1084" />
+<TGConnectingPoint num="3" id="1085" />
+<TGConnectingPoint num="4" id="1086" />
+<TGConnectingPoint num="5" id="1087" />
+<TGConnectingPoint num="6" id="1088" />
+<TGConnectingPoint num="7" id="1089" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5003" id="1218" index="9" uid="451d5e5e-bf99-48b4-85ad-e63209864c9b" >
+<COMPONENT type="5003" id="1099" index="3" uid="451d5e5e-bf99-48b4-85ad-e63209864c9b" >
 <cdparam x="68" y="261" />
-<sizeparam width="123" height="62" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="119" height="72" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="DataType0" value="Key" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1210" />
-<TGConnectingPoint num="1" id="1211" />
-<TGConnectingPoint num="2" id="1212" />
-<TGConnectingPoint num="3" id="1213" />
-<TGConnectingPoint num="4" id="1214" />
-<TGConnectingPoint num="5" id="1215" />
-<TGConnectingPoint num="6" id="1216" />
-<TGConnectingPoint num="7" id="1217" />
+<TGConnectingPoint num="0" id="1091" />
+<TGConnectingPoint num="1" id="1092" />
+<TGConnectingPoint num="2" id="1093" />
+<TGConnectingPoint num="3" id="1094" />
+<TGConnectingPoint num="4" id="1095" />
+<TGConnectingPoint num="5" id="1096" />
+<TGConnectingPoint num="6" id="1097" />
+<TGConnectingPoint num="7" id="1098" />
 <extraparam>
 <Attribute access="0" id="data" value="" type="8" typeOther="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5000" id="1341" index="10" uid="b2874923-24b8-4f17-bd28-ee88aa64f45c" >
+<COMPONENT type="5000" id="1222" index="4" uid="b2874923-24b8-4f17-bd28-ee88aa64f45c" >
 <cdparam x="21" y="34" />
 <sizeparam width="438" height="219" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1900" minY="10" maxY="900" />
 <infoparam name="Block0" value="System" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1301" />
-<TGConnectingPoint num="1" id="1302" />
-<TGConnectingPoint num="2" id="1303" />
-<TGConnectingPoint num="3" id="1304" />
-<TGConnectingPoint num="4" id="1305" />
-<TGConnectingPoint num="5" id="1306" />
-<TGConnectingPoint num="6" id="1307" />
-<TGConnectingPoint num="7" id="1308" />
-<TGConnectingPoint num="8" id="1309" />
-<TGConnectingPoint num="9" id="1310" />
-<TGConnectingPoint num="10" id="1311" />
-<TGConnectingPoint num="11" id="1312" />
-<TGConnectingPoint num="12" id="1313" />
-<TGConnectingPoint num="13" id="1314" />
-<TGConnectingPoint num="14" id="1315" />
-<TGConnectingPoint num="15" id="1316" />
-<TGConnectingPoint num="16" id="1317" />
-<TGConnectingPoint num="17" id="1318" />
-<TGConnectingPoint num="18" id="1319" />
-<TGConnectingPoint num="19" id="1320" />
-<TGConnectingPoint num="20" id="1321" />
-<TGConnectingPoint num="21" id="1322" />
-<TGConnectingPoint num="22" id="1323" />
-<TGConnectingPoint num="23" id="1324" />
-<TGConnectingPoint num="24" id="1325" />
-<TGConnectingPoint num="25" id="1326" />
-<TGConnectingPoint num="26" id="1327" />
-<TGConnectingPoint num="27" id="1328" />
-<TGConnectingPoint num="28" id="1329" />
-<TGConnectingPoint num="29" id="1330" />
-<TGConnectingPoint num="30" id="1331" />
-<TGConnectingPoint num="31" id="1332" />
-<TGConnectingPoint num="32" id="1333" />
-<TGConnectingPoint num="33" id="1334" />
-<TGConnectingPoint num="34" id="1335" />
-<TGConnectingPoint num="35" id="1336" />
-<TGConnectingPoint num="36" id="1337" />
-<TGConnectingPoint num="37" id="1338" />
-<TGConnectingPoint num="38" id="1339" />
-<TGConnectingPoint num="39" id="1340" />
+<TGConnectingPoint num="0" id="1182" />
+<TGConnectingPoint num="1" id="1183" />
+<TGConnectingPoint num="2" id="1184" />
+<TGConnectingPoint num="3" id="1185" />
+<TGConnectingPoint num="4" id="1186" />
+<TGConnectingPoint num="5" id="1187" />
+<TGConnectingPoint num="6" id="1188" />
+<TGConnectingPoint num="7" id="1189" />
+<TGConnectingPoint num="8" id="1190" />
+<TGConnectingPoint num="9" id="1191" />
+<TGConnectingPoint num="10" id="1192" />
+<TGConnectingPoint num="11" id="1193" />
+<TGConnectingPoint num="12" id="1194" />
+<TGConnectingPoint num="13" id="1195" />
+<TGConnectingPoint num="14" id="1196" />
+<TGConnectingPoint num="15" id="1197" />
+<TGConnectingPoint num="16" id="1198" />
+<TGConnectingPoint num="17" id="1199" />
+<TGConnectingPoint num="18" id="1200" />
+<TGConnectingPoint num="19" id="1201" />
+<TGConnectingPoint num="20" id="1202" />
+<TGConnectingPoint num="21" id="1203" />
+<TGConnectingPoint num="22" id="1204" />
+<TGConnectingPoint num="23" id="1205" />
+<TGConnectingPoint num="24" id="1206" />
+<TGConnectingPoint num="25" id="1207" />
+<TGConnectingPoint num="26" id="1208" />
+<TGConnectingPoint num="27" id="1209" />
+<TGConnectingPoint num="28" id="1210" />
+<TGConnectingPoint num="29" id="1211" />
+<TGConnectingPoint num="30" id="1212" />
+<TGConnectingPoint num="31" id="1213" />
+<TGConnectingPoint num="32" id="1214" />
+<TGConnectingPoint num="33" id="1215" />
+<TGConnectingPoint num="34" id="1216" />
+<TGConnectingPoint num="35" id="1217" />
+<TGConnectingPoint num="36" id="1218" />
+<TGConnectingPoint num="37" id="1219" />
+<TGConnectingPoint num="38" id="1220" />
+<TGConnectingPoint num="39" id="1221" />
 <extraparam>
 <blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
@@ -2792,61 +2544,61 @@
 <Signal value="out chout(Message msg)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="1259" index="13" uid="5e66075c-c37b-4b3e-ac45-2340e7ead245" >
-<father id="1341" num="0" />
-<cdparam x="36" y="122" />
-<sizeparam width="215" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="1140" index="7" uid="8227d454-31f1-4610-afd9-7ec516c8d9f4" >
+<father id="1222" num="0" />
+<cdparam x="263" y="122" />
+<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
-<infoparam name="Block0" value="T1" />
+<cdrectangleparam minX="0" maxX="299" minY="0" maxY="93" />
+<infoparam name="Block0" value="T2" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1219" />
-<TGConnectingPoint num="1" id="1220" />
-<TGConnectingPoint num="2" id="1221" />
-<TGConnectingPoint num="3" id="1222" />
-<TGConnectingPoint num="4" id="1223" />
-<TGConnectingPoint num="5" id="1224" />
-<TGConnectingPoint num="6" id="1225" />
-<TGConnectingPoint num="7" id="1226" />
-<TGConnectingPoint num="8" id="1227" />
-<TGConnectingPoint num="9" id="1228" />
-<TGConnectingPoint num="10" id="1229" />
-<TGConnectingPoint num="11" id="1230" />
-<TGConnectingPoint num="12" id="1231" />
-<TGConnectingPoint num="13" id="1232" />
-<TGConnectingPoint num="14" id="1233" />
-<TGConnectingPoint num="15" id="1234" />
-<TGConnectingPoint num="16" id="1235" />
-<TGConnectingPoint num="17" id="1236" />
-<TGConnectingPoint num="18" id="1237" />
-<TGConnectingPoint num="19" id="1238" />
-<TGConnectingPoint num="20" id="1239" />
-<TGConnectingPoint num="21" id="1240" />
-<TGConnectingPoint num="22" id="1241" />
-<TGConnectingPoint num="23" id="1242" />
-<TGConnectingPoint num="24" id="1243" />
-<TGConnectingPoint num="25" id="1244" />
-<TGConnectingPoint num="26" id="1245" />
-<TGConnectingPoint num="27" id="1246" />
-<TGConnectingPoint num="28" id="1247" />
-<TGConnectingPoint num="29" id="1248" />
-<TGConnectingPoint num="30" id="1249" />
-<TGConnectingPoint num="31" id="1250" />
-<TGConnectingPoint num="32" id="1251" />
-<TGConnectingPoint num="33" id="1252" />
-<TGConnectingPoint num="34" id="1253" />
-<TGConnectingPoint num="35" id="1254" />
-<TGConnectingPoint num="36" id="1255" />
-<TGConnectingPoint num="37" id="1256" />
-<TGConnectingPoint num="38" id="1257" />
-<TGConnectingPoint num="39" id="1258" />
+<TGConnectingPoint num="0" id="1100" />
+<TGConnectingPoint num="1" id="1101" />
+<TGConnectingPoint num="2" id="1102" />
+<TGConnectingPoint num="3" id="1103" />
+<TGConnectingPoint num="4" id="1104" />
+<TGConnectingPoint num="5" id="1105" />
+<TGConnectingPoint num="6" id="1106" />
+<TGConnectingPoint num="7" id="1107" />
+<TGConnectingPoint num="8" id="1108" />
+<TGConnectingPoint num="9" id="1109" />
+<TGConnectingPoint num="10" id="1110" />
+<TGConnectingPoint num="11" id="1111" />
+<TGConnectingPoint num="12" id="1112" />
+<TGConnectingPoint num="13" id="1113" />
+<TGConnectingPoint num="14" id="1114" />
+<TGConnectingPoint num="15" id="1115" />
+<TGConnectingPoint num="16" id="1116" />
+<TGConnectingPoint num="17" id="1117" />
+<TGConnectingPoint num="18" id="1118" />
+<TGConnectingPoint num="19" id="1119" />
+<TGConnectingPoint num="20" id="1120" />
+<TGConnectingPoint num="21" id="1121" />
+<TGConnectingPoint num="22" id="1122" />
+<TGConnectingPoint num="23" id="1123" />
+<TGConnectingPoint num="24" id="1124" />
+<TGConnectingPoint num="25" id="1125" />
+<TGConnectingPoint num="26" id="1126" />
+<TGConnectingPoint num="27" id="1127" />
+<TGConnectingPoint num="28" id="1128" />
+<TGConnectingPoint num="29" id="1129" />
+<TGConnectingPoint num="30" id="1130" />
+<TGConnectingPoint num="31" id="1131" />
+<TGConnectingPoint num="32" id="1132" />
+<TGConnectingPoint num="33" id="1133" />
+<TGConnectingPoint num="34" id="1134" />
+<TGConnectingPoint num="35" id="1135" />
+<TGConnectingPoint num="36" id="1136" />
+<TGConnectingPoint num="37" id="1137" />
+<TGConnectingPoint num="38" id="1138" />
+<TGConnectingPoint num="39" id="1139" />
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <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" />
+<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)" />
@@ -2871,61 +2623,61 @@
 <Method value="Message hash(Message msg)" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="1300" index="14" uid="8227d454-31f1-4610-afd9-7ec516c8d9f4" >
-<father id="1341" num="1" />
-<cdparam x="263" y="122" />
-<sizeparam width="139" height="126" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<SUBCOMPONENT type="5000" id="1181" index="8" uid="5e66075c-c37b-4b3e-ac45-2340e7ead245" >
+<father id="1222" num="1" />
+<cdparam x="36" y="122" />
+<sizeparam width="215" 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="T2" />
+<cdrectangleparam minX="0" maxX="223" minY="0" maxY="93" />
+<infoparam name="Block0" value="T1" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1260" />
-<TGConnectingPoint num="1" id="1261" />
-<TGConnectingPoint num="2" id="1262" />
-<TGConnectingPoint num="3" id="1263" />
-<TGConnectingPoint num="4" id="1264" />
-<TGConnectingPoint num="5" id="1265" />
-<TGConnectingPoint num="6" id="1266" />
-<TGConnectingPoint num="7" id="1267" />
-<TGConnectingPoint num="8" id="1268" />
-<TGConnectingPoint num="9" id="1269" />
-<TGConnectingPoint num="10" id="1270" />
-<TGConnectingPoint num="11" id="1271" />
-<TGConnectingPoint num="12" id="1272" />
-<TGConnectingPoint num="13" id="1273" />
-<TGConnectingPoint num="14" id="1274" />
-<TGConnectingPoint num="15" id="1275" />
-<TGConnectingPoint num="16" id="1276" />
-<TGConnectingPoint num="17" id="1277" />
-<TGConnectingPoint num="18" id="1278" />
-<TGConnectingPoint num="19" id="1279" />
-<TGConnectingPoint num="20" id="1280" />
-<TGConnectingPoint num="21" id="1281" />
-<TGConnectingPoint num="22" id="1282" />
-<TGConnectingPoint num="23" id="1283" />
-<TGConnectingPoint num="24" id="1284" />
-<TGConnectingPoint num="25" id="1285" />
-<TGConnectingPoint num="26" id="1286" />
-<TGConnectingPoint num="27" id="1287" />
-<TGConnectingPoint num="28" id="1288" />
-<TGConnectingPoint num="29" id="1289" />
-<TGConnectingPoint num="30" id="1290" />
-<TGConnectingPoint num="31" id="1291" />
-<TGConnectingPoint num="32" id="1292" />
-<TGConnectingPoint num="33" id="1293" />
-<TGConnectingPoint num="34" id="1294" />
-<TGConnectingPoint num="35" id="1295" />
-<TGConnectingPoint num="36" id="1296" />
-<TGConnectingPoint num="37" id="1297" />
-<TGConnectingPoint num="38" id="1298" />
-<TGConnectingPoint num="39" id="1299" />
+<TGConnectingPoint num="0" id="1141" />
+<TGConnectingPoint num="1" id="1142" />
+<TGConnectingPoint num="2" id="1143" />
+<TGConnectingPoint num="3" id="1144" />
+<TGConnectingPoint num="4" id="1145" />
+<TGConnectingPoint num="5" id="1146" />
+<TGConnectingPoint num="6" id="1147" />
+<TGConnectingPoint num="7" id="1148" />
+<TGConnectingPoint num="8" id="1149" />
+<TGConnectingPoint num="9" id="1150" />
+<TGConnectingPoint num="10" id="1151" />
+<TGConnectingPoint num="11" id="1152" />
+<TGConnectingPoint num="12" id="1153" />
+<TGConnectingPoint num="13" id="1154" />
+<TGConnectingPoint num="14" id="1155" />
+<TGConnectingPoint num="15" id="1156" />
+<TGConnectingPoint num="16" id="1157" />
+<TGConnectingPoint num="17" id="1158" />
+<TGConnectingPoint num="18" id="1159" />
+<TGConnectingPoint num="19" id="1160" />
+<TGConnectingPoint num="20" id="1161" />
+<TGConnectingPoint num="21" id="1162" />
+<TGConnectingPoint num="22" id="1163" />
+<TGConnectingPoint num="23" id="1164" />
+<TGConnectingPoint num="24" id="1165" />
+<TGConnectingPoint num="25" id="1166" />
+<TGConnectingPoint num="26" id="1167" />
+<TGConnectingPoint num="27" id="1168" />
+<TGConnectingPoint num="28" id="1169" />
+<TGConnectingPoint num="29" id="1170" />
+<TGConnectingPoint num="30" id="1171" />
+<TGConnectingPoint num="31" id="1172" />
+<TGConnectingPoint num="32" id="1173" />
+<TGConnectingPoint num="33" id="1174" />
+<TGConnectingPoint num="34" id="1175" />
+<TGConnectingPoint num="35" id="1176" />
+<TGConnectingPoint num="36" id="1177" />
+<TGConnectingPoint num="37" id="1178" />
+<TGConnectingPoint num="38" id="1179" />
+<TGConnectingPoint num="39" id="1180" />
 <extraparam>
 <blockType data="cryptoblock" color="-4072719" />
 <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="m2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m1" 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)" />
@@ -2955,42 +2707,42 @@
 </AVATARBlockDiagramPanel>
 
 <AVATARStateMachineDiagramPanel name="System" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<COMPONENT type="5100" id="1343" index="0" uid="2a2c10a3-2522-4320-932b-b2a72310dc26" >
+<COMPONENT type="5100" id="1224" index="0" uid="2a2c10a3-2522-4320-932b-b2a72310dc26" >
 <cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="start state" value="null" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1342" />
+<TGConnectingPoint num="0" id="1223" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="5102" id="1350" index="0" uid="d136535c-615e-448c-af04-d358fe7a731b" >
-<cdparam x="407" y="60" />
+<AVATARStateMachineDiagramPanel name="T2" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="5102" id="1231" index="0" uid="edc55b0e-f500-4ae5-9b56-7a366a01b624" >
+<cdparam x="395" y="469" />
 <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="1349" />
-<P1  x="407" y="60" id="1611" />
-<P2  x="609" y="140" id="1539" />
+<TGConnectingPoint num="0" id="1230" />
+<P1  x="407" y="464" id="1286" />
+<P2  x="407" y="496" id="1267" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1348" index="11" uid="a4480bd7-059a-4123-8886-d7757d7b6529" >
-<father id="1350" num="0" />
-<cdparam x="508" y="100" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1229" index="13" uid="9bada02f-ec5d-408b-af44-53d0a89198f0" >
+<father id="1231" num="0" />
+<cdparam x="396" y="482" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1344" />
-<TGConnectingPoint num="1" id="1345" />
-<TGConnectingPoint num="2" id="1346" />
-<TGConnectingPoint num="3" id="1347" />
+<TGConnectingPoint num="0" id="1225" />
+<TGConnectingPoint num="1" id="1226" />
+<TGConnectingPoint num="2" id="1227" />
+<TGConnectingPoint num="3" id="1228" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3004,28 +2756,28 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1357" index="1" uid="a444de41-918b-4483-bb92-d487ccb52c85" >
-<cdparam x="400" y="140" />
+<CONNECTOR type="5102" id="1238" index="1" uid="e64f71d6-01b6-4924-84a5-ddfe2f705bf8" >
+<cdparam x="394" y="393" />
 <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="1356" />
-<P1  x="400" y="140" id="1538" />
-<P2  x="415" y="235" id="1527" />
+<TGConnectingPoint num="0" id="1237" />
+<P1  x="407" y="375" id="1359" />
+<P2  x="407" y="414" id="1281" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1355" index="12" uid="ada740d3-6df3-4121-940a-0b71069da521" >
-<father id="1357" num="0" />
-<cdparam x="407" y="187" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1236" index="14" uid="c94c80e6-67f5-4e10-84de-27e982e75bf3" >
+<father id="1238" num="0" />
+<cdparam x="418" y="384" />
+<sizeparam width="150" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1351" />
-<TGConnectingPoint num="1" id="1352" />
-<TGConnectingPoint num="2" id="1353" />
-<TGConnectingPoint num="3" id="1354" />
+<TGConnectingPoint num="0" id="1232" />
+<TGConnectingPoint num="1" id="1233" />
+<TGConnectingPoint num="2" id="1234" />
+<TGConnectingPoint num="3" id="1235" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3036,31 +2788,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="receivedData = m.data" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1364" index="2" uid="0c933618-60ab-421c-81f2-f3bf291f51f3" >
-<cdparam x="400" y="440" />
+<CONNECTOR type="5102" id="1245" index="2" uid="47607c76-cf2e-4f89-8503-79bf5282b993" >
+<cdparam x="402" y="302" />
 <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="1363" />
-<P1  x="400" y="440" id="1381" />
-<P2  x="410" y="535" id="1379" />
+<TGConnectingPoint num="0" id="1244" />
+<P1  x="407" y="283" id="1432" />
+<P2  x="407" y="325" id="1354" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1362" index="13" uid="31756fd6-c1df-4358-98b9-7cf140f7f6c0" >
-<father id="1364" num="0" />
-<cdparam x="405" y="487" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1243" index="15" uid="4855ec11-3969-447f-a2c0-dc5cf4895675" >
+<father id="1245" num="0" />
+<cdparam x="414" y="290" />
+<sizeparam width="139" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1358" />
-<TGConnectingPoint num="1" id="1359" />
-<TGConnectingPoint num="2" id="1360" />
-<TGConnectingPoint num="3" id="1361" />
+<TGConnectingPoint num="0" id="1239" />
+<TGConnectingPoint num="1" id="1240" />
+<TGConnectingPoint num="2" id="1241" />
+<TGConnectingPoint num="3" id="1242" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3071,31 +2824,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="m = sdecrypt(m2, sk)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1371" index="3" uid="cdad3972-1c37-43a2-81ed-308b5c055d99" >
-<cdparam x="415" y="265" />
+<CONNECTOR type="5102" id="1252" index="3" uid="4f71ab0f-a3a4-45f7-9ad5-af71552000d5" >
+<cdparam x="409" y="219" />
 <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="1370" />
-<P1  x="415" y="265" id="1528" />
-<P2  x="504" y="340" id="1455" />
+<TGConnectingPoint num="0" id="1251" />
+<P1  x="407" y="206" id="1270" />
+<P2  x="407" y="233" id="1427" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1369" index="14" uid="b47789a1-4759-4155-b788-2f064eddbd93" >
-<father id="1371" num="0" />
-<cdparam x="459" y="302" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1250" index="16" uid="28e36de1-decd-4011-8627-42cd43330833" >
+<father id="1252" num="0" />
+<cdparam x="405" y="235" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1365" />
-<TGConnectingPoint num="1" id="1366" />
-<TGConnectingPoint num="2" id="1367" />
-<TGConnectingPoint num="3" id="1368" />
+<TGConnectingPoint num="0" id="1246" />
+<TGConnectingPoint num="1" id="1247" />
+<TGConnectingPoint num="2" id="1248" />
+<TGConnectingPoint num="3" id="1249" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3109,28 +2863,63 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1378" index="4" uid="5c465d11-1f71-4a51-ab67-99d03bab40dc" >
-<cdparam x="400" y="340" />
+<CONNECTOR type="5102" id="1259" index="4" uid="eed44c30-c8cb-4486-bfba-2f7089925b47" >
+<cdparam x="405" y="155" />
 <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="1377" />
-<P1  x="400" y="340" id="1454" />
-<P2  x="532" y="440" id="1382" />
+<TGConnectingPoint num="0" id="1258" />
+<P1  x="407" y="144" id="1505" />
+<P2  x="407" y="176" id="1269" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1376" index="15" uid="6230852b-cc2f-4400-9236-0511c3339d22" >
-<father id="1378" num="0" />
-<cdparam x="466" y="390" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1257" index="17" uid="ce660052-6a00-4141-bfab-3c62705c6a88" >
+<father id="1259" num="0" />
+<cdparam x="407" y="172" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1253" />
+<TGConnectingPoint num="1" id="1254" />
+<TGConnectingPoint num="2" id="1255" />
+<TGConnectingPoint num="3" id="1256" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1266" index="5" uid="af1891b6-d8d0-4340-bf3b-bdfad4961575" >
+<cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1265" />
+<P1  x="407" y="70" id="1572" />
+<P2  x="407" y="94" id="1500" />
+<AutomaticDrawing  data="true" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1264" index="18" uid="ce77428e-5f8d-4961-a651-df86aa584218" >
+<father id="1266" num="0" />
+<cdparam x="406" y="87" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1372" />
-<TGConnectingPoint num="1" id="1373" />
-<TGConnectingPoint num="2" id="1374" />
-<TGConnectingPoint num="3" id="1375" />
+<TGConnectingPoint num="0" id="1260" />
+<TGConnectingPoint num="1" id="1261" />
+<TGConnectingPoint num="2" id="1262" />
+<TGConnectingPoint num="3" id="1263" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3141,328 +2930,411 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="Cipherdata=sdecrypt(Cipherdata_encrypted,key_Cipherdata)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="1380" index="5" uid="c4862c1a-f4bb-4e99-9bc5-f49a58b81d73" >
-<cdparam x="400" y="540" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1268" index="6" uid="20ba76d9-e438-4116-a1e2-7cd2b772f28b" >
+<cdparam x="397" y="501" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1379" />
+<TGConnectingPoint num="0" id="1267" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1453" index="6" uid="4ae46258-7124-4479-ad91-be3253050953" >
-<cdparam x="400" y="440" />
-<sizeparam width="264" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1279" index="7" uid="86bbe846-7a5e-4969-9fc1-0a889fcfe503" >
+<cdparam x="371" y="181" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state" value="decrypt_Cipherdata_dummy" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1381" />
-<TGConnectingPoint num="1" id="1382" />
-<TGConnectingPoint num="2" id="1383" />
-<TGConnectingPoint num="3" id="1384" />
-<TGConnectingPoint num="4" id="1385" />
-<TGConnectingPoint num="5" id="1386" />
-<TGConnectingPoint num="6" id="1387" />
-<TGConnectingPoint num="7" id="1388" />
-<TGConnectingPoint num="8" id="1389" />
-<TGConnectingPoint num="9" id="1390" />
-<TGConnectingPoint num="10" id="1391" />
-<TGConnectingPoint num="11" id="1392" />
-<TGConnectingPoint num="12" id="1393" />
-<TGConnectingPoint num="13" id="1394" />
-<TGConnectingPoint num="14" id="1395" />
-<TGConnectingPoint num="15" id="1396" />
-<TGConnectingPoint num="16" id="1397" />
-<TGConnectingPoint num="17" id="1398" />
-<TGConnectingPoint num="18" id="1399" />
-<TGConnectingPoint num="19" id="1400" />
-<TGConnectingPoint num="20" id="1401" />
-<TGConnectingPoint num="21" id="1402" />
-<TGConnectingPoint num="22" id="1403" />
-<TGConnectingPoint num="23" id="1404" />
-<TGConnectingPoint num="24" id="1405" />
-<TGConnectingPoint num="25" id="1406" />
-<TGConnectingPoint num="26" id="1407" />
-<TGConnectingPoint num="27" id="1408" />
-<TGConnectingPoint num="28" id="1409" />
-<TGConnectingPoint num="29" id="1410" />
-<TGConnectingPoint num="30" id="1411" />
-<TGConnectingPoint num="31" id="1412" />
-<TGConnectingPoint num="32" id="1413" />
-<TGConnectingPoint num="33" id="1414" />
-<TGConnectingPoint num="34" id="1415" />
-<TGConnectingPoint num="35" id="1416" />
-<TGConnectingPoint num="36" id="1417" />
-<TGConnectingPoint num="37" id="1418" />
-<TGConnectingPoint num="38" id="1419" />
-<TGConnectingPoint num="39" id="1420" />
-<TGConnectingPoint num="40" id="1421" />
-<TGConnectingPoint num="41" id="1422" />
-<TGConnectingPoint num="42" id="1423" />
-<TGConnectingPoint num="43" id="1424" />
-<TGConnectingPoint num="44" id="1425" />
-<TGConnectingPoint num="45" id="1426" />
-<TGConnectingPoint num="46" id="1427" />
-<TGConnectingPoint num="47" id="1428" />
-<TGConnectingPoint num="48" id="1429" />
-<TGConnectingPoint num="49" id="1430" />
-<TGConnectingPoint num="50" id="1431" />
-<TGConnectingPoint num="51" id="1432" />
-<TGConnectingPoint num="52" id="1433" />
-<TGConnectingPoint num="53" id="1434" />
-<TGConnectingPoint num="54" id="1435" />
-<TGConnectingPoint num="55" id="1436" />
-<TGConnectingPoint num="56" id="1437" />
-<TGConnectingPoint num="57" id="1438" />
-<TGConnectingPoint num="58" id="1439" />
-<TGConnectingPoint num="59" id="1440" />
-<TGConnectingPoint num="60" id="1441" />
-<TGConnectingPoint num="61" id="1442" />
-<TGConnectingPoint num="62" id="1443" />
-<TGConnectingPoint num="63" id="1444" />
-<TGConnectingPoint num="64" id="1445" />
-<TGConnectingPoint num="65" id="1446" />
-<TGConnectingPoint num="66" id="1447" />
-<TGConnectingPoint num="67" id="1448" />
-<TGConnectingPoint num="68" id="1449" />
-<TGConnectingPoint num="69" id="1450" />
-<TGConnectingPoint num="70" id="1451" />
-<TGConnectingPoint num="71" id="1452" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1526" index="7" uid="11cdf67c-cc38-497a-8568-8d06b6685b50" >
-<cdparam x="400" y="340" />
-<sizeparam width="209" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chin(m2)" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1269" />
+<TGConnectingPoint num="1" id="1270" />
+<TGConnectingPoint num="2" id="1271" />
+<TGConnectingPoint num="3" id="1272" />
+<TGConnectingPoint num="4" id="1273" />
+<TGConnectingPoint num="5" id="1274" />
+<TGConnectingPoint num="6" id="1275" />
+<TGConnectingPoint num="7" id="1276" />
+<TGConnectingPoint num="8" id="1277" />
+<TGConnectingPoint num="9" id="1278" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1352" index="8" uid="e9303f09-a7a8-4000-ab27-b55943c6dbf4" >
+<cdparam x="308" y="414" />
+<sizeparam width="198" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state" value="_decrypt_Cipherdata" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1454" />
-<TGConnectingPoint num="1" id="1455" />
-<TGConnectingPoint num="2" id="1456" />
-<TGConnectingPoint num="3" id="1457" />
-<TGConnectingPoint num="4" id="1458" />
-<TGConnectingPoint num="5" id="1459" />
-<TGConnectingPoint num="6" id="1460" />
-<TGConnectingPoint num="7" id="1461" />
-<TGConnectingPoint num="8" id="1462" />
-<TGConnectingPoint num="9" id="1463" />
-<TGConnectingPoint num="10" id="1464" />
-<TGConnectingPoint num="11" id="1465" />
-<TGConnectingPoint num="12" id="1466" />
-<TGConnectingPoint num="13" id="1467" />
-<TGConnectingPoint num="14" id="1468" />
-<TGConnectingPoint num="15" id="1469" />
-<TGConnectingPoint num="16" id="1470" />
-<TGConnectingPoint num="17" id="1471" />
-<TGConnectingPoint num="18" id="1472" />
-<TGConnectingPoint num="19" id="1473" />
-<TGConnectingPoint num="20" id="1474" />
-<TGConnectingPoint num="21" id="1475" />
-<TGConnectingPoint num="22" id="1476" />
-<TGConnectingPoint num="23" id="1477" />
-<TGConnectingPoint num="24" id="1478" />
-<TGConnectingPoint num="25" id="1479" />
-<TGConnectingPoint num="26" id="1480" />
-<TGConnectingPoint num="27" id="1481" />
-<TGConnectingPoint num="28" id="1482" />
-<TGConnectingPoint num="29" id="1483" />
-<TGConnectingPoint num="30" id="1484" />
-<TGConnectingPoint num="31" id="1485" />
-<TGConnectingPoint num="32" id="1486" />
-<TGConnectingPoint num="33" id="1487" />
-<TGConnectingPoint num="34" id="1488" />
-<TGConnectingPoint num="35" id="1489" />
-<TGConnectingPoint num="36" id="1490" />
-<TGConnectingPoint num="37" id="1491" />
-<TGConnectingPoint num="38" id="1492" />
-<TGConnectingPoint num="39" id="1493" />
-<TGConnectingPoint num="40" id="1494" />
-<TGConnectingPoint num="41" id="1495" />
-<TGConnectingPoint num="42" id="1496" />
-<TGConnectingPoint num="43" id="1497" />
-<TGConnectingPoint num="44" id="1498" />
-<TGConnectingPoint num="45" id="1499" />
-<TGConnectingPoint num="46" id="1500" />
-<TGConnectingPoint num="47" id="1501" />
-<TGConnectingPoint num="48" id="1502" />
-<TGConnectingPoint num="49" id="1503" />
-<TGConnectingPoint num="50" id="1504" />
-<TGConnectingPoint num="51" id="1505" />
-<TGConnectingPoint num="52" id="1506" />
-<TGConnectingPoint num="53" id="1507" />
-<TGConnectingPoint num="54" id="1508" />
-<TGConnectingPoint num="55" id="1509" />
-<TGConnectingPoint num="56" id="1510" />
-<TGConnectingPoint num="57" id="1511" />
-<TGConnectingPoint num="58" id="1512" />
-<TGConnectingPoint num="59" id="1513" />
-<TGConnectingPoint num="60" id="1514" />
-<TGConnectingPoint num="61" id="1515" />
-<TGConnectingPoint num="62" id="1516" />
-<TGConnectingPoint num="63" id="1517" />
-<TGConnectingPoint num="64" id="1518" />
-<TGConnectingPoint num="65" id="1519" />
-<TGConnectingPoint num="66" id="1520" />
-<TGConnectingPoint num="67" id="1521" />
-<TGConnectingPoint num="68" id="1522" />
-<TGConnectingPoint num="69" id="1523" />
-<TGConnectingPoint num="70" id="1524" />
-<TGConnectingPoint num="71" id="1525" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="1537" index="8" uid="fec71be0-2548-4a96-beab-ca3a8083b8b6" >
-<cdparam x="400" y="240" />
-<sizeparam width="30" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state2" value="SecretDataReceived" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1280" />
+<TGConnectingPoint num="1" id="1281" />
+<TGConnectingPoint num="2" id="1282" />
+<TGConnectingPoint num="3" id="1283" />
+<TGConnectingPoint num="4" id="1284" />
+<TGConnectingPoint num="5" id="1285" />
+<TGConnectingPoint num="6" id="1286" />
+<TGConnectingPoint num="7" id="1287" />
+<TGConnectingPoint num="8" id="1288" />
+<TGConnectingPoint num="9" id="1289" />
+<TGConnectingPoint num="10" id="1290" />
+<TGConnectingPoint num="11" id="1291" />
+<TGConnectingPoint num="12" id="1292" />
+<TGConnectingPoint num="13" id="1293" />
+<TGConnectingPoint num="14" id="1294" />
+<TGConnectingPoint num="15" id="1295" />
+<TGConnectingPoint num="16" id="1296" />
+<TGConnectingPoint num="17" id="1297" />
+<TGConnectingPoint num="18" id="1298" />
+<TGConnectingPoint num="19" id="1299" />
+<TGConnectingPoint num="20" id="1300" />
+<TGConnectingPoint num="21" id="1301" />
+<TGConnectingPoint num="22" id="1302" />
+<TGConnectingPoint num="23" id="1303" />
+<TGConnectingPoint num="24" id="1304" />
+<TGConnectingPoint num="25" id="1305" />
+<TGConnectingPoint num="26" id="1306" />
+<TGConnectingPoint num="27" id="1307" />
+<TGConnectingPoint num="28" id="1308" />
+<TGConnectingPoint num="29" id="1309" />
+<TGConnectingPoint num="30" id="1310" />
+<TGConnectingPoint num="31" id="1311" />
+<TGConnectingPoint num="32" id="1312" />
+<TGConnectingPoint num="33" id="1313" />
+<TGConnectingPoint num="34" id="1314" />
+<TGConnectingPoint num="35" id="1315" />
+<TGConnectingPoint num="36" id="1316" />
+<TGConnectingPoint num="37" id="1317" />
+<TGConnectingPoint num="38" id="1318" />
+<TGConnectingPoint num="39" id="1319" />
+<TGConnectingPoint num="40" id="1320" />
+<TGConnectingPoint num="41" id="1321" />
+<TGConnectingPoint num="42" id="1322" />
+<TGConnectingPoint num="43" id="1323" />
+<TGConnectingPoint num="44" id="1324" />
+<TGConnectingPoint num="45" id="1325" />
+<TGConnectingPoint num="46" id="1326" />
+<TGConnectingPoint num="47" id="1327" />
+<TGConnectingPoint num="48" id="1328" />
+<TGConnectingPoint num="49" id="1329" />
+<TGConnectingPoint num="50" id="1330" />
+<TGConnectingPoint num="51" id="1331" />
+<TGConnectingPoint num="52" id="1332" />
+<TGConnectingPoint num="53" id="1333" />
+<TGConnectingPoint num="54" id="1334" />
+<TGConnectingPoint num="55" id="1335" />
+<TGConnectingPoint num="56" id="1336" />
+<TGConnectingPoint num="57" id="1337" />
+<TGConnectingPoint num="58" id="1338" />
+<TGConnectingPoint num="59" id="1339" />
+<TGConnectingPoint num="60" id="1340" />
+<TGConnectingPoint num="61" id="1341" />
+<TGConnectingPoint num="62" id="1342" />
+<TGConnectingPoint num="63" id="1343" />
+<TGConnectingPoint num="64" id="1344" />
+<TGConnectingPoint num="65" id="1345" />
+<TGConnectingPoint num="66" id="1346" />
+<TGConnectingPoint num="67" id="1347" />
+<TGConnectingPoint num="68" id="1348" />
+<TGConnectingPoint num="69" id="1349" />
+<TGConnectingPoint num="70" id="1350" />
+<TGConnectingPoint num="71" id="1351" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1425" index="9" uid="150a585c-334b-46d1-af20-10110426b07e" >
+<cdparam x="319" y="325" />
+<sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Receive signal" value="comm(Cipherdata_encrypted)" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1527" />
-<TGConnectingPoint num="1" id="1528" />
-<TGConnectingPoint num="2" id="1529" />
-<TGConnectingPoint num="3" id="1530" />
-<TGConnectingPoint num="4" id="1531" />
-<TGConnectingPoint num="5" id="1532" />
-<TGConnectingPoint num="6" id="1533" />
-<TGConnectingPoint num="7" id="1534" />
-<TGConnectingPoint num="8" id="1535" />
-<TGConnectingPoint num="9" id="1536" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1610" index="9" uid="bbe520fa-9f06-41af-b196-10fb5500ee31" >
-<cdparam x="400" y="140" />
-<sizeparam width="418" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state1" value="messageDecrypted" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1353" />
+<TGConnectingPoint num="1" id="1354" />
+<TGConnectingPoint num="2" id="1355" />
+<TGConnectingPoint num="3" id="1356" />
+<TGConnectingPoint num="4" id="1357" />
+<TGConnectingPoint num="5" id="1358" />
+<TGConnectingPoint num="6" id="1359" />
+<TGConnectingPoint num="7" id="1360" />
+<TGConnectingPoint num="8" id="1361" />
+<TGConnectingPoint num="9" id="1362" />
+<TGConnectingPoint num="10" id="1363" />
+<TGConnectingPoint num="11" id="1364" />
+<TGConnectingPoint num="12" id="1365" />
+<TGConnectingPoint num="13" id="1366" />
+<TGConnectingPoint num="14" id="1367" />
+<TGConnectingPoint num="15" id="1368" />
+<TGConnectingPoint num="16" id="1369" />
+<TGConnectingPoint num="17" id="1370" />
+<TGConnectingPoint num="18" id="1371" />
+<TGConnectingPoint num="19" id="1372" />
+<TGConnectingPoint num="20" id="1373" />
+<TGConnectingPoint num="21" id="1374" />
+<TGConnectingPoint num="22" id="1375" />
+<TGConnectingPoint num="23" id="1376" />
+<TGConnectingPoint num="24" id="1377" />
+<TGConnectingPoint num="25" id="1378" />
+<TGConnectingPoint num="26" id="1379" />
+<TGConnectingPoint num="27" id="1380" />
+<TGConnectingPoint num="28" id="1381" />
+<TGConnectingPoint num="29" id="1382" />
+<TGConnectingPoint num="30" id="1383" />
+<TGConnectingPoint num="31" id="1384" />
+<TGConnectingPoint num="32" id="1385" />
+<TGConnectingPoint num="33" id="1386" />
+<TGConnectingPoint num="34" id="1387" />
+<TGConnectingPoint num="35" id="1388" />
+<TGConnectingPoint num="36" id="1389" />
+<TGConnectingPoint num="37" id="1390" />
+<TGConnectingPoint num="38" id="1391" />
+<TGConnectingPoint num="39" id="1392" />
+<TGConnectingPoint num="40" id="1393" />
+<TGConnectingPoint num="41" id="1394" />
+<TGConnectingPoint num="42" id="1395" />
+<TGConnectingPoint num="43" id="1396" />
+<TGConnectingPoint num="44" id="1397" />
+<TGConnectingPoint num="45" id="1398" />
+<TGConnectingPoint num="46" id="1399" />
+<TGConnectingPoint num="47" id="1400" />
+<TGConnectingPoint num="48" id="1401" />
+<TGConnectingPoint num="49" id="1402" />
+<TGConnectingPoint num="50" id="1403" />
+<TGConnectingPoint num="51" id="1404" />
+<TGConnectingPoint num="52" id="1405" />
+<TGConnectingPoint num="53" id="1406" />
+<TGConnectingPoint num="54" id="1407" />
+<TGConnectingPoint num="55" id="1408" />
+<TGConnectingPoint num="56" id="1409" />
+<TGConnectingPoint num="57" id="1410" />
+<TGConnectingPoint num="58" id="1411" />
+<TGConnectingPoint num="59" id="1412" />
+<TGConnectingPoint num="60" id="1413" />
+<TGConnectingPoint num="61" id="1414" />
+<TGConnectingPoint num="62" id="1415" />
+<TGConnectingPoint num="63" id="1416" />
+<TGConnectingPoint num="64" id="1417" />
+<TGConnectingPoint num="65" id="1418" />
+<TGConnectingPoint num="66" id="1419" />
+<TGConnectingPoint num="67" id="1420" />
+<TGConnectingPoint num="68" id="1421" />
+<TGConnectingPoint num="69" id="1422" />
+<TGConnectingPoint num="70" id="1423" />
+<TGConnectingPoint num="71" id="1424" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1498" index="10" uid="4d4e46c4-bb01-4735-acbe-9465e10e672e" >
+<cdparam x="319" y="233" />
+<sizeparam width="176" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state" value="signalstate_readchannel_SecureFV__comm" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1538" />
-<TGConnectingPoint num="1" id="1539" />
-<TGConnectingPoint num="2" id="1540" />
-<TGConnectingPoint num="3" id="1541" />
-<TGConnectingPoint num="4" id="1542" />
-<TGConnectingPoint num="5" id="1543" />
-<TGConnectingPoint num="6" id="1544" />
-<TGConnectingPoint num="7" id="1545" />
-<TGConnectingPoint num="8" id="1546" />
-<TGConnectingPoint num="9" id="1547" />
-<TGConnectingPoint num="10" id="1548" />
-<TGConnectingPoint num="11" id="1549" />
-<TGConnectingPoint num="12" id="1550" />
-<TGConnectingPoint num="13" id="1551" />
-<TGConnectingPoint num="14" id="1552" />
-<TGConnectingPoint num="15" id="1553" />
-<TGConnectingPoint num="16" id="1554" />
-<TGConnectingPoint num="17" id="1555" />
-<TGConnectingPoint num="18" id="1556" />
-<TGConnectingPoint num="19" id="1557" />
-<TGConnectingPoint num="20" id="1558" />
-<TGConnectingPoint num="21" id="1559" />
-<TGConnectingPoint num="22" id="1560" />
-<TGConnectingPoint num="23" id="1561" />
-<TGConnectingPoint num="24" id="1562" />
-<TGConnectingPoint num="25" id="1563" />
-<TGConnectingPoint num="26" id="1564" />
-<TGConnectingPoint num="27" id="1565" />
-<TGConnectingPoint num="28" id="1566" />
-<TGConnectingPoint num="29" id="1567" />
-<TGConnectingPoint num="30" id="1568" />
-<TGConnectingPoint num="31" id="1569" />
-<TGConnectingPoint num="32" id="1570" />
-<TGConnectingPoint num="33" id="1571" />
-<TGConnectingPoint num="34" id="1572" />
-<TGConnectingPoint num="35" id="1573" />
-<TGConnectingPoint num="36" id="1574" />
-<TGConnectingPoint num="37" id="1575" />
-<TGConnectingPoint num="38" id="1576" />
-<TGConnectingPoint num="39" id="1577" />
-<TGConnectingPoint num="40" id="1578" />
-<TGConnectingPoint num="41" id="1579" />
-<TGConnectingPoint num="42" id="1580" />
-<TGConnectingPoint num="43" id="1581" />
-<TGConnectingPoint num="44" id="1582" />
-<TGConnectingPoint num="45" id="1583" />
-<TGConnectingPoint num="46" id="1584" />
-<TGConnectingPoint num="47" id="1585" />
-<TGConnectingPoint num="48" id="1586" />
-<TGConnectingPoint num="49" id="1587" />
-<TGConnectingPoint num="50" id="1588" />
-<TGConnectingPoint num="51" id="1589" />
-<TGConnectingPoint num="52" id="1590" />
-<TGConnectingPoint num="53" id="1591" />
-<TGConnectingPoint num="54" id="1592" />
-<TGConnectingPoint num="55" id="1593" />
-<TGConnectingPoint num="56" id="1594" />
-<TGConnectingPoint num="57" id="1595" />
-<TGConnectingPoint num="58" id="1596" />
-<TGConnectingPoint num="59" id="1597" />
-<TGConnectingPoint num="60" id="1598" />
-<TGConnectingPoint num="61" id="1599" />
-<TGConnectingPoint num="62" id="1600" />
-<TGConnectingPoint num="63" id="1601" />
-<TGConnectingPoint num="64" id="1602" />
-<TGConnectingPoint num="65" id="1603" />
-<TGConnectingPoint num="66" id="1604" />
-<TGConnectingPoint num="67" id="1605" />
-<TGConnectingPoint num="68" id="1606" />
-<TGConnectingPoint num="69" id="1607" />
-<TGConnectingPoint num="70" id="1608" />
-<TGConnectingPoint num="71" id="1609" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1612" index="10" uid="dff5c2b0-8221-4467-aa4e-ee8e4f930297" >
-<cdparam x="400" y="40" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state0" value="messageDecrypt" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1426" />
+<TGConnectingPoint num="1" id="1427" />
+<TGConnectingPoint num="2" id="1428" />
+<TGConnectingPoint num="3" id="1429" />
+<TGConnectingPoint num="4" id="1430" />
+<TGConnectingPoint num="5" id="1431" />
+<TGConnectingPoint num="6" id="1432" />
+<TGConnectingPoint num="7" id="1433" />
+<TGConnectingPoint num="8" id="1434" />
+<TGConnectingPoint num="9" id="1435" />
+<TGConnectingPoint num="10" id="1436" />
+<TGConnectingPoint num="11" id="1437" />
+<TGConnectingPoint num="12" id="1438" />
+<TGConnectingPoint num="13" id="1439" />
+<TGConnectingPoint num="14" id="1440" />
+<TGConnectingPoint num="15" id="1441" />
+<TGConnectingPoint num="16" id="1442" />
+<TGConnectingPoint num="17" id="1443" />
+<TGConnectingPoint num="18" id="1444" />
+<TGConnectingPoint num="19" id="1445" />
+<TGConnectingPoint num="20" id="1446" />
+<TGConnectingPoint num="21" id="1447" />
+<TGConnectingPoint num="22" id="1448" />
+<TGConnectingPoint num="23" id="1449" />
+<TGConnectingPoint num="24" id="1450" />
+<TGConnectingPoint num="25" id="1451" />
+<TGConnectingPoint num="26" id="1452" />
+<TGConnectingPoint num="27" id="1453" />
+<TGConnectingPoint num="28" id="1454" />
+<TGConnectingPoint num="29" id="1455" />
+<TGConnectingPoint num="30" id="1456" />
+<TGConnectingPoint num="31" id="1457" />
+<TGConnectingPoint num="32" id="1458" />
+<TGConnectingPoint num="33" id="1459" />
+<TGConnectingPoint num="34" id="1460" />
+<TGConnectingPoint num="35" id="1461" />
+<TGConnectingPoint num="36" id="1462" />
+<TGConnectingPoint num="37" id="1463" />
+<TGConnectingPoint num="38" id="1464" />
+<TGConnectingPoint num="39" id="1465" />
+<TGConnectingPoint num="40" id="1466" />
+<TGConnectingPoint num="41" id="1467" />
+<TGConnectingPoint num="42" id="1468" />
+<TGConnectingPoint num="43" id="1469" />
+<TGConnectingPoint num="44" id="1470" />
+<TGConnectingPoint num="45" id="1471" />
+<TGConnectingPoint num="46" id="1472" />
+<TGConnectingPoint num="47" id="1473" />
+<TGConnectingPoint num="48" id="1474" />
+<TGConnectingPoint num="49" id="1475" />
+<TGConnectingPoint num="50" id="1476" />
+<TGConnectingPoint num="51" id="1477" />
+<TGConnectingPoint num="52" id="1478" />
+<TGConnectingPoint num="53" id="1479" />
+<TGConnectingPoint num="54" id="1480" />
+<TGConnectingPoint num="55" id="1481" />
+<TGConnectingPoint num="56" id="1482" />
+<TGConnectingPoint num="57" id="1483" />
+<TGConnectingPoint num="58" id="1484" />
+<TGConnectingPoint num="59" id="1485" />
+<TGConnectingPoint num="60" id="1486" />
+<TGConnectingPoint num="61" id="1487" />
+<TGConnectingPoint num="62" id="1488" />
+<TGConnectingPoint num="63" id="1489" />
+<TGConnectingPoint num="64" id="1490" />
+<TGConnectingPoint num="65" id="1491" />
+<TGConnectingPoint num="66" id="1492" />
+<TGConnectingPoint num="67" id="1493" />
+<TGConnectingPoint num="68" id="1494" />
+<TGConnectingPoint num="69" id="1495" />
+<TGConnectingPoint num="70" id="1496" />
+<TGConnectingPoint num="71" id="1497" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1571" index="11" uid="3aa2ea31-6fdb-4b90-af14-8397fa04f75e" >
+<cdparam x="314" y="94" />
+<sizeparam width="187" 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" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state" value="waitingForMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1499" />
+<TGConnectingPoint num="1" id="1500" />
+<TGConnectingPoint num="2" id="1501" />
+<TGConnectingPoint num="3" id="1502" />
+<TGConnectingPoint num="4" id="1503" />
+<TGConnectingPoint num="5" id="1504" />
+<TGConnectingPoint num="6" id="1505" />
+<TGConnectingPoint num="7" id="1506" />
+<TGConnectingPoint num="8" id="1507" />
+<TGConnectingPoint num="9" id="1508" />
+<TGConnectingPoint num="10" id="1509" />
+<TGConnectingPoint num="11" id="1510" />
+<TGConnectingPoint num="12" id="1511" />
+<TGConnectingPoint num="13" id="1512" />
+<TGConnectingPoint num="14" id="1513" />
+<TGConnectingPoint num="15" id="1514" />
+<TGConnectingPoint num="16" id="1515" />
+<TGConnectingPoint num="17" id="1516" />
+<TGConnectingPoint num="18" id="1517" />
+<TGConnectingPoint num="19" id="1518" />
+<TGConnectingPoint num="20" id="1519" />
+<TGConnectingPoint num="21" id="1520" />
+<TGConnectingPoint num="22" id="1521" />
+<TGConnectingPoint num="23" id="1522" />
+<TGConnectingPoint num="24" id="1523" />
+<TGConnectingPoint num="25" id="1524" />
+<TGConnectingPoint num="26" id="1525" />
+<TGConnectingPoint num="27" id="1526" />
+<TGConnectingPoint num="28" id="1527" />
+<TGConnectingPoint num="29" id="1528" />
+<TGConnectingPoint num="30" id="1529" />
+<TGConnectingPoint num="31" id="1530" />
+<TGConnectingPoint num="32" id="1531" />
+<TGConnectingPoint num="33" id="1532" />
+<TGConnectingPoint num="34" id="1533" />
+<TGConnectingPoint num="35" id="1534" />
+<TGConnectingPoint num="36" id="1535" />
+<TGConnectingPoint num="37" id="1536" />
+<TGConnectingPoint num="38" id="1537" />
+<TGConnectingPoint num="39" id="1538" />
+<TGConnectingPoint num="40" id="1539" />
+<TGConnectingPoint num="41" id="1540" />
+<TGConnectingPoint num="42" id="1541" />
+<TGConnectingPoint num="43" id="1542" />
+<TGConnectingPoint num="44" id="1543" />
+<TGConnectingPoint num="45" id="1544" />
+<TGConnectingPoint num="46" id="1545" />
+<TGConnectingPoint num="47" id="1546" />
+<TGConnectingPoint num="48" id="1547" />
+<TGConnectingPoint num="49" id="1548" />
+<TGConnectingPoint num="50" id="1549" />
+<TGConnectingPoint num="51" id="1550" />
+<TGConnectingPoint num="52" id="1551" />
+<TGConnectingPoint num="53" id="1552" />
+<TGConnectingPoint num="54" id="1553" />
+<TGConnectingPoint num="55" id="1554" />
+<TGConnectingPoint num="56" id="1555" />
+<TGConnectingPoint num="57" id="1556" />
+<TGConnectingPoint num="58" id="1557" />
+<TGConnectingPoint num="59" id="1558" />
+<TGConnectingPoint num="60" id="1559" />
+<TGConnectingPoint num="61" id="1560" />
+<TGConnectingPoint num="62" id="1561" />
+<TGConnectingPoint num="63" id="1562" />
+<TGConnectingPoint num="64" id="1563" />
+<TGConnectingPoint num="65" id="1564" />
+<TGConnectingPoint num="66" id="1565" />
+<TGConnectingPoint num="67" id="1566" />
+<TGConnectingPoint num="68" id="1567" />
+<TGConnectingPoint num="69" id="1568" />
+<TGConnectingPoint num="70" id="1569" />
+<TGConnectingPoint num="71" id="1570" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1573" index="12" uid="f575d4ce-8f5a-4412-8719-8c43d635e0aa" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="0" id="1572" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="5102" id="1619" index="0" uid="b61e36ff-3b23-41b8-88e9-ee79fcb65d8e" >
-<cdparam x="400" y="140" />
+<AVATARStateMachineDiagramPanel name="T1" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
+<CONNECTOR type="5102" id="1580" index="0" uid="ce94cfa7-aef2-468f-9fd0-1b4dfaf7b8a7" >
+<cdparam x="415" y="424" />
 <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="1618" />
-<P1  x="400" y="140" id="1727" />
-<P2  x="614" y="240" id="1655" />
+<TGConnectingPoint num="0" id="1579" />
+<P1  x="407" y="395" id="1628" />
+<P2  x="407" y="427" id="1609" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1617" index="9" uid="9d2c4db1-7b0a-4691-b3cf-74689db805e1" >
-<father id="1619" num="0" />
-<cdparam x="507" y="190" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1578" index="11" uid="94671695-0076-490d-b899-f09376230b97" >
+<father id="1580" num="0" />
+<cdparam x="417" y="439" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1613" />
-<TGConnectingPoint num="1" id="1614" />
-<TGConnectingPoint num="2" id="1615" />
-<TGConnectingPoint num="3" id="1616" />
+<TGConnectingPoint num="0" id="1574" />
+<TGConnectingPoint num="1" id="1575" />
+<TGConnectingPoint num="2" id="1576" />
+<TGConnectingPoint num="3" id="1577" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3473,32 +3345,31 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="Cipherdata_encrypted=sencrypt(Cipherdata,key_Cipherdata)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1626" index="1" uid="2e61c8bc-771a-4afa-883c-1aac7412efe4" >
-<cdparam x="400" y="240" />
+<CONNECTOR type="5102" id="1587" index="1" uid="09aa030f-da9c-4ca9-934a-f8e4dddab812" >
+<cdparam x="391" y="347" />
 <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="1625" />
-<P1  x="400" y="240" id="1654" />
-<P2  x="415" y="335" id="1643" />
+<TGConnectingPoint num="0" id="1586" />
+<P1  x="407" y="316" id="1612" />
+<P2  x="407" y="345" id="1623" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1624" index="10" uid="14080b12-95f6-4511-abde-58253a90f3fc" >
-<father id="1626" num="0" />
-<cdparam x="407" y="287" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1585" index="12" uid="5ebef96c-c283-4a83-8ab4-b9f768bdc69a" >
+<father id="1587" num="0" />
+<cdparam x="403" y="360" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1620" />
-<TGConnectingPoint num="1" id="1621" />
-<TGConnectingPoint num="2" id="1622" />
-<TGConnectingPoint num="3" id="1623" />
+<TGConnectingPoint num="0" id="1581" />
+<TGConnectingPoint num="1" id="1582" />
+<TGConnectingPoint num="2" id="1583" />
+<TGConnectingPoint num="3" id="1584" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3512,28 +3383,28 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1633" index="2" uid="ae7b6eab-db51-44de-90c6-bed005fbd336" >
-<cdparam x="415" y="365" />
+<CONNECTOR type="5102" id="1594" index="2" uid="b0773c14-d673-48ec-8a0d-368a914d7659" >
+<cdparam x="402" y="259" />
 <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="1632" />
-<P1  x="415" y="365" id="1644" />
-<P2  x="410" y="435" id="1641" />
+<TGConnectingPoint num="0" id="1593" />
+<P1  x="407" y="251" id="1701" />
+<P2  x="407" y="286" id="1611" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1631" index="11" uid="629a7d2d-49c0-480c-b9ff-0f5bbce32279" >
-<father id="1633" num="0" />
-<cdparam x="412" y="400" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1592" index="13" uid="431fe931-d360-4d82-a961-bb06def46164" >
+<father id="1594" num="0" />
+<cdparam x="396" y="288" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1627" />
-<TGConnectingPoint num="1" id="1628" />
-<TGConnectingPoint num="2" id="1629" />
-<TGConnectingPoint num="3" id="1630" />
+<TGConnectingPoint num="0" id="1588" />
+<TGConnectingPoint num="1" id="1589" />
+<TGConnectingPoint num="2" id="1590" />
+<TGConnectingPoint num="3" id="1591" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3547,28 +3418,65 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1640" index="3" uid="6b2834ee-e8d2-482c-8aa2-57eb340a4499" >
-<cdparam x="407" y="60" />
+<CONNECTOR type="5102" id="1601" index="3" uid="629a469f-b822-4d82-ad31-fe215694f348" >
+<cdparam x="408" y="157" />
 <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="1639" />
-<P1  x="407" y="60" id="1800" />
-<P2  x="504" y="140" id="1728" />
+<TGConnectingPoint num="0" id="1600" />
+<P1  x="407" y="146" id="1774" />
+<P2  x="407" y="201" id="1696" />
 <AutomaticDrawing  data="true" />
 <new d="false" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1638" index="12" uid="cd48c035-0ba6-4a91-86f5-c99b5437b132" >
-<father id="1640" num="0" />
-<cdparam x="455" y="100" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1599" index="14" uid="e83d5fa5-f48e-4fa7-9c57-41477f5d6bf1" >
+<father id="1601" num="0" />
+<cdparam x="423" y="157" />
+<sizeparam width="137" height="32" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1595" />
+<TGConnectingPoint num="1" id="1596" />
+<TGConnectingPoint num="2" id="1597" />
+<TGConnectingPoint num="3" id="1598" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<extraDelay1 value="" enabled="true"/>
+<extraDelay2 value="" enabled="true"/>
+<delayDistributionLaw value="0" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="m.data = secretData" enabled="true"/>
+<actions value="m1=sencrypt(m, sk)" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1608" index="4" uid="51cfa3c1-b4b3-4f8a-a39e-2ae83a70822c" >
+<cdparam x="407" y="70" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<infoparam name="connector" value="null" />
+<TGConnectingPoint num="0" id="1607" />
+<P1  x="407" y="70" id="1841" />
+<P2  x="407" y="96" id="1769" />
+<AutomaticDrawing  data="true" />
+<new d="false" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1606" index="15" uid="964e1d86-bec0-4756-93d0-846d9f391f38" >
+<father id="1608" num="0" />
+<cdparam x="407" y="88" />
+<sizeparam width="10" height="25" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1634" />
-<TGConnectingPoint num="1" id="1635" />
-<TGConnectingPoint num="2" id="1636" />
-<TGConnectingPoint num="3" id="1637" />
+<TGConnectingPoint num="0" id="1602" />
+<TGConnectingPoint num="1" id="1603" />
+<TGConnectingPoint num="2" id="1604" />
+<TGConnectingPoint num="3" id="1605" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3582,240 +3490,296 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="1642" index="4" uid="ce8751fb-e861-4e9a-8c82-efe7bf4edff1" >
-<cdparam x="400" y="440" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1610" index="5" uid="f2d509bb-6c90-4fe9-8998-a1f3ee464692" >
+<cdparam x="397" y="432" />
+<sizeparam width="20" height="20" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="stop state" value="null" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1641" />
+<TGConnectingPoint num="0" id="1609" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1653" index="5" uid="a39e2538-52e8-49bd-bb41-d1ac8936c4d4" >
-<cdparam x="400" y="340" />
-<sizeparam width="30" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1621" index="6" uid="513b9c1b-68e3-45fa-a7c1-e7c652f2d4dc" >
+<cdparam x="370" y="291" />
+<sizeparam width="75" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="comm(Cipherdata_encrypted)" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(m1)" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1643" />
-<TGConnectingPoint num="1" id="1644" />
-<TGConnectingPoint num="2" id="1645" />
-<TGConnectingPoint num="3" id="1646" />
-<TGConnectingPoint num="4" id="1647" />
-<TGConnectingPoint num="5" id="1648" />
-<TGConnectingPoint num="6" id="1649" />
-<TGConnectingPoint num="7" id="1650" />
-<TGConnectingPoint num="8" id="1651" />
-<TGConnectingPoint num="9" id="1652" />
+<TGConnectingPoint num="0" id="1611" />
+<TGConnectingPoint num="1" id="1612" />
+<TGConnectingPoint num="2" id="1613" />
+<TGConnectingPoint num="3" id="1614" />
+<TGConnectingPoint num="4" id="1615" />
+<TGConnectingPoint num="5" id="1616" />
+<TGConnectingPoint num="6" id="1617" />
+<TGConnectingPoint num="7" id="1618" />
+<TGConnectingPoint num="8" id="1619" />
+<TGConnectingPoint num="9" id="1620" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1726" index="6" uid="483e1849-7a0d-4d31-a4d1-0ab29a3514bd" >
-<cdparam x="400" y="240" />
-<sizeparam width="429" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1694" index="7" uid="defb63c1-a401-4179-9076-9386467ff3d2" >
+<cdparam x="341" y="345" />
+<sizeparam width="132" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state" value="signalstate_writechannel_SecureFV__comm" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1654" />
-<TGConnectingPoint num="1" id="1655" />
-<TGConnectingPoint num="2" id="1656" />
-<TGConnectingPoint num="3" id="1657" />
-<TGConnectingPoint num="4" id="1658" />
-<TGConnectingPoint num="5" id="1659" />
-<TGConnectingPoint num="6" id="1660" />
-<TGConnectingPoint num="7" id="1661" />
-<TGConnectingPoint num="8" id="1662" />
-<TGConnectingPoint num="9" id="1663" />
-<TGConnectingPoint num="10" id="1664" />
-<TGConnectingPoint num="11" id="1665" />
-<TGConnectingPoint num="12" id="1666" />
-<TGConnectingPoint num="13" id="1667" />
-<TGConnectingPoint num="14" id="1668" />
-<TGConnectingPoint num="15" id="1669" />
-<TGConnectingPoint num="16" id="1670" />
-<TGConnectingPoint num="17" id="1671" />
-<TGConnectingPoint num="18" id="1672" />
-<TGConnectingPoint num="19" id="1673" />
-<TGConnectingPoint num="20" id="1674" />
-<TGConnectingPoint num="21" id="1675" />
-<TGConnectingPoint num="22" id="1676" />
-<TGConnectingPoint num="23" id="1677" />
-<TGConnectingPoint num="24" id="1678" />
-<TGConnectingPoint num="25" id="1679" />
-<TGConnectingPoint num="26" id="1680" />
-<TGConnectingPoint num="27" id="1681" />
-<TGConnectingPoint num="28" id="1682" />
-<TGConnectingPoint num="29" id="1683" />
-<TGConnectingPoint num="30" id="1684" />
-<TGConnectingPoint num="31" id="1685" />
-<TGConnectingPoint num="32" id="1686" />
-<TGConnectingPoint num="33" id="1687" />
-<TGConnectingPoint num="34" id="1688" />
-<TGConnectingPoint num="35" id="1689" />
-<TGConnectingPoint num="36" id="1690" />
-<TGConnectingPoint num="37" id="1691" />
-<TGConnectingPoint num="38" id="1692" />
-<TGConnectingPoint num="39" id="1693" />
-<TGConnectingPoint num="40" id="1694" />
-<TGConnectingPoint num="41" id="1695" />
-<TGConnectingPoint num="42" id="1696" />
-<TGConnectingPoint num="43" id="1697" />
-<TGConnectingPoint num="44" id="1698" />
-<TGConnectingPoint num="45" id="1699" />
-<TGConnectingPoint num="46" id="1700" />
-<TGConnectingPoint num="47" id="1701" />
-<TGConnectingPoint num="48" id="1702" />
-<TGConnectingPoint num="49" id="1703" />
-<TGConnectingPoint num="50" id="1704" />
-<TGConnectingPoint num="51" id="1705" />
-<TGConnectingPoint num="52" id="1706" />
-<TGConnectingPoint num="53" id="1707" />
-<TGConnectingPoint num="54" id="1708" />
-<TGConnectingPoint num="55" id="1709" />
-<TGConnectingPoint num="56" id="1710" />
-<TGConnectingPoint num="57" id="1711" />
-<TGConnectingPoint num="58" id="1712" />
-<TGConnectingPoint num="59" id="1713" />
-<TGConnectingPoint num="60" id="1714" />
-<TGConnectingPoint num="61" id="1715" />
-<TGConnectingPoint num="62" id="1716" />
-<TGConnectingPoint num="63" id="1717" />
-<TGConnectingPoint num="64" id="1718" />
-<TGConnectingPoint num="65" id="1719" />
-<TGConnectingPoint num="66" id="1720" />
-<TGConnectingPoint num="67" id="1721" />
-<TGConnectingPoint num="68" id="1722" />
-<TGConnectingPoint num="69" id="1723" />
-<TGConnectingPoint num="70" id="1724" />
-<TGConnectingPoint num="71" id="1725" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5106" id="1799" index="7" uid="9b7363fc-969d-4b41-b1b6-12db4c3224fe" >
-<cdparam x="400" y="140" />
-<sizeparam width="209" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state1" value="beforeFinish" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1622" />
+<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="2" id="1624" />
+<TGConnectingPoint num="3" id="1625" />
+<TGConnectingPoint num="4" id="1626" />
+<TGConnectingPoint num="5" id="1627" />
+<TGConnectingPoint num="6" id="1628" />
+<TGConnectingPoint num="7" id="1629" />
+<TGConnectingPoint num="8" id="1630" />
+<TGConnectingPoint num="9" id="1631" />
+<TGConnectingPoint num="10" id="1632" />
+<TGConnectingPoint num="11" id="1633" />
+<TGConnectingPoint num="12" id="1634" />
+<TGConnectingPoint num="13" id="1635" />
+<TGConnectingPoint num="14" id="1636" />
+<TGConnectingPoint num="15" id="1637" />
+<TGConnectingPoint num="16" id="1638" />
+<TGConnectingPoint num="17" id="1639" />
+<TGConnectingPoint num="18" id="1640" />
+<TGConnectingPoint num="19" id="1641" />
+<TGConnectingPoint num="20" id="1642" />
+<TGConnectingPoint num="21" id="1643" />
+<TGConnectingPoint num="22" id="1644" />
+<TGConnectingPoint num="23" id="1645" />
+<TGConnectingPoint num="24" id="1646" />
+<TGConnectingPoint num="25" id="1647" />
+<TGConnectingPoint num="26" id="1648" />
+<TGConnectingPoint num="27" id="1649" />
+<TGConnectingPoint num="28" id="1650" />
+<TGConnectingPoint num="29" id="1651" />
+<TGConnectingPoint num="30" id="1652" />
+<TGConnectingPoint num="31" id="1653" />
+<TGConnectingPoint num="32" id="1654" />
+<TGConnectingPoint num="33" id="1655" />
+<TGConnectingPoint num="34" id="1656" />
+<TGConnectingPoint num="35" id="1657" />
+<TGConnectingPoint num="36" id="1658" />
+<TGConnectingPoint num="37" id="1659" />
+<TGConnectingPoint num="38" id="1660" />
+<TGConnectingPoint num="39" id="1661" />
+<TGConnectingPoint num="40" id="1662" />
+<TGConnectingPoint num="41" id="1663" />
+<TGConnectingPoint num="42" id="1664" />
+<TGConnectingPoint num="43" id="1665" />
+<TGConnectingPoint num="44" id="1666" />
+<TGConnectingPoint num="45" id="1667" />
+<TGConnectingPoint num="46" id="1668" />
+<TGConnectingPoint num="47" id="1669" />
+<TGConnectingPoint num="48" id="1670" />
+<TGConnectingPoint num="49" id="1671" />
+<TGConnectingPoint num="50" id="1672" />
+<TGConnectingPoint num="51" id="1673" />
+<TGConnectingPoint num="52" id="1674" />
+<TGConnectingPoint num="53" id="1675" />
+<TGConnectingPoint num="54" id="1676" />
+<TGConnectingPoint num="55" id="1677" />
+<TGConnectingPoint num="56" id="1678" />
+<TGConnectingPoint num="57" id="1679" />
+<TGConnectingPoint num="58" id="1680" />
+<TGConnectingPoint num="59" id="1681" />
+<TGConnectingPoint num="60" id="1682" />
+<TGConnectingPoint num="61" id="1683" />
+<TGConnectingPoint num="62" id="1684" />
+<TGConnectingPoint num="63" id="1685" />
+<TGConnectingPoint num="64" id="1686" />
+<TGConnectingPoint num="65" id="1687" />
+<TGConnectingPoint num="66" id="1688" />
+<TGConnectingPoint num="67" id="1689" />
+<TGConnectingPoint num="68" id="1690" />
+<TGConnectingPoint num="69" id="1691" />
+<TGConnectingPoint num="70" id="1692" />
+<TGConnectingPoint num="71" id="1693" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1767" index="8" uid="e6fa3ceb-038a-48e0-b376-8177f0b14a21" >
+<cdparam x="330" y="201" />
+<sizeparam width="154" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="state" value="_encrypt_Cipherdata" />
-<new d="false" />
-<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" />
-<TGConnectingPoint num="10" id="1737" />
-<TGConnectingPoint num="11" id="1738" />
-<TGConnectingPoint num="12" id="1739" />
-<TGConnectingPoint num="13" id="1740" />
-<TGConnectingPoint num="14" id="1741" />
-<TGConnectingPoint num="15" id="1742" />
-<TGConnectingPoint num="16" id="1743" />
-<TGConnectingPoint num="17" id="1744" />
-<TGConnectingPoint num="18" id="1745" />
-<TGConnectingPoint num="19" id="1746" />
-<TGConnectingPoint num="20" id="1747" />
-<TGConnectingPoint num="21" id="1748" />
-<TGConnectingPoint num="22" id="1749" />
-<TGConnectingPoint num="23" id="1750" />
-<TGConnectingPoint num="24" id="1751" />
-<TGConnectingPoint num="25" id="1752" />
-<TGConnectingPoint num="26" id="1753" />
-<TGConnectingPoint num="27" id="1754" />
-<TGConnectingPoint num="28" id="1755" />
-<TGConnectingPoint num="29" id="1756" />
-<TGConnectingPoint num="30" id="1757" />
-<TGConnectingPoint num="31" id="1758" />
-<TGConnectingPoint num="32" id="1759" />
-<TGConnectingPoint num="33" id="1760" />
-<TGConnectingPoint num="34" id="1761" />
-<TGConnectingPoint num="35" id="1762" />
-<TGConnectingPoint num="36" id="1763" />
-<TGConnectingPoint num="37" id="1764" />
-<TGConnectingPoint num="38" id="1765" />
-<TGConnectingPoint num="39" id="1766" />
-<TGConnectingPoint num="40" id="1767" />
-<TGConnectingPoint num="41" id="1768" />
-<TGConnectingPoint num="42" id="1769" />
-<TGConnectingPoint num="43" id="1770" />
-<TGConnectingPoint num="44" id="1771" />
-<TGConnectingPoint num="45" id="1772" />
-<TGConnectingPoint num="46" id="1773" />
-<TGConnectingPoint num="47" id="1774" />
-<TGConnectingPoint num="48" id="1775" />
-<TGConnectingPoint num="49" id="1776" />
-<TGConnectingPoint num="50" id="1777" />
-<TGConnectingPoint num="51" id="1778" />
-<TGConnectingPoint num="52" id="1779" />
-<TGConnectingPoint num="53" id="1780" />
-<TGConnectingPoint num="54" id="1781" />
-<TGConnectingPoint num="55" id="1782" />
-<TGConnectingPoint num="56" id="1783" />
-<TGConnectingPoint num="57" id="1784" />
-<TGConnectingPoint num="58" id="1785" />
-<TGConnectingPoint num="59" id="1786" />
-<TGConnectingPoint num="60" id="1787" />
-<TGConnectingPoint num="61" id="1788" />
-<TGConnectingPoint num="62" id="1789" />
-<TGConnectingPoint num="63" id="1790" />
-<TGConnectingPoint num="64" id="1791" />
-<TGConnectingPoint num="65" id="1792" />
-<TGConnectingPoint num="66" id="1793" />
-<TGConnectingPoint num="67" id="1794" />
-<TGConnectingPoint num="68" id="1795" />
-<TGConnectingPoint num="69" id="1796" />
-<TGConnectingPoint num="70" id="1797" />
-<TGConnectingPoint num="71" id="1798" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5100" id="1801" index="8" uid="542f6f80-1cb0-4084-a232-40e30f3cf9b7" >
-<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="1400" minY="10" maxY="900" />
-<infoparam name="start state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1800" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Block" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="5100" id="1803" index="0" uid="4c3c8484-535c-4b95-aaa2-26f03b5f0371" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="state0" value="sendingMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1695" />
+<TGConnectingPoint num="1" id="1696" />
+<TGConnectingPoint num="2" id="1697" />
+<TGConnectingPoint num="3" id="1698" />
+<TGConnectingPoint num="4" id="1699" />
+<TGConnectingPoint num="5" id="1700" />
+<TGConnectingPoint num="6" id="1701" />
+<TGConnectingPoint num="7" id="1702" />
+<TGConnectingPoint num="8" id="1703" />
+<TGConnectingPoint num="9" id="1704" />
+<TGConnectingPoint num="10" id="1705" />
+<TGConnectingPoint num="11" id="1706" />
+<TGConnectingPoint num="12" id="1707" />
+<TGConnectingPoint num="13" id="1708" />
+<TGConnectingPoint num="14" id="1709" />
+<TGConnectingPoint num="15" id="1710" />
+<TGConnectingPoint num="16" id="1711" />
+<TGConnectingPoint num="17" id="1712" />
+<TGConnectingPoint num="18" id="1713" />
+<TGConnectingPoint num="19" id="1714" />
+<TGConnectingPoint num="20" id="1715" />
+<TGConnectingPoint num="21" id="1716" />
+<TGConnectingPoint num="22" id="1717" />
+<TGConnectingPoint num="23" id="1718" />
+<TGConnectingPoint num="24" id="1719" />
+<TGConnectingPoint num="25" id="1720" />
+<TGConnectingPoint num="26" id="1721" />
+<TGConnectingPoint num="27" id="1722" />
+<TGConnectingPoint num="28" id="1723" />
+<TGConnectingPoint num="29" id="1724" />
+<TGConnectingPoint num="30" id="1725" />
+<TGConnectingPoint num="31" id="1726" />
+<TGConnectingPoint num="32" id="1727" />
+<TGConnectingPoint num="33" id="1728" />
+<TGConnectingPoint num="34" id="1729" />
+<TGConnectingPoint num="35" id="1730" />
+<TGConnectingPoint num="36" id="1731" />
+<TGConnectingPoint num="37" id="1732" />
+<TGConnectingPoint num="38" id="1733" />
+<TGConnectingPoint num="39" id="1734" />
+<TGConnectingPoint num="40" id="1735" />
+<TGConnectingPoint num="41" id="1736" />
+<TGConnectingPoint num="42" id="1737" />
+<TGConnectingPoint num="43" id="1738" />
+<TGConnectingPoint num="44" id="1739" />
+<TGConnectingPoint num="45" id="1740" />
+<TGConnectingPoint num="46" id="1741" />
+<TGConnectingPoint num="47" id="1742" />
+<TGConnectingPoint num="48" id="1743" />
+<TGConnectingPoint num="49" id="1744" />
+<TGConnectingPoint num="50" id="1745" />
+<TGConnectingPoint num="51" id="1746" />
+<TGConnectingPoint num="52" id="1747" />
+<TGConnectingPoint num="53" id="1748" />
+<TGConnectingPoint num="54" id="1749" />
+<TGConnectingPoint num="55" id="1750" />
+<TGConnectingPoint num="56" id="1751" />
+<TGConnectingPoint num="57" id="1752" />
+<TGConnectingPoint num="58" id="1753" />
+<TGConnectingPoint num="59" id="1754" />
+<TGConnectingPoint num="60" id="1755" />
+<TGConnectingPoint num="61" id="1756" />
+<TGConnectingPoint num="62" id="1757" />
+<TGConnectingPoint num="63" id="1758" />
+<TGConnectingPoint num="64" id="1759" />
+<TGConnectingPoint num="65" id="1760" />
+<TGConnectingPoint num="66" id="1761" />
+<TGConnectingPoint num="67" id="1762" />
+<TGConnectingPoint num="68" id="1763" />
+<TGConnectingPoint num="69" id="1764" />
+<TGConnectingPoint num="70" id="1765" />
+<TGConnectingPoint num="71" id="1766" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1840" index="9" uid="8f8dc2f5-b479-4d41-ae02-0324cb91d22e" >
+<cdparam x="336" y="96" />
+<sizeparam width="143" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<new d="false" />
-<TGConnectingPoint num="0" id="1802" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Block" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
-<COMPONENT type="5100" id="1805" index="0" uid="cc504eef-3b15-49c9-86ea-d4ecd41e8022" >
+<infoparam name="state" value="makingMessage" />
+<new d="false" />
+<TGConnectingPoint num="0" id="1768" />
+<TGConnectingPoint num="1" id="1769" />
+<TGConnectingPoint num="2" id="1770" />
+<TGConnectingPoint num="3" id="1771" />
+<TGConnectingPoint num="4" id="1772" />
+<TGConnectingPoint num="5" id="1773" />
+<TGConnectingPoint num="6" id="1774" />
+<TGConnectingPoint num="7" id="1775" />
+<TGConnectingPoint num="8" id="1776" />
+<TGConnectingPoint num="9" id="1777" />
+<TGConnectingPoint num="10" id="1778" />
+<TGConnectingPoint num="11" id="1779" />
+<TGConnectingPoint num="12" id="1780" />
+<TGConnectingPoint num="13" id="1781" />
+<TGConnectingPoint num="14" id="1782" />
+<TGConnectingPoint num="15" id="1783" />
+<TGConnectingPoint num="16" id="1784" />
+<TGConnectingPoint num="17" id="1785" />
+<TGConnectingPoint num="18" id="1786" />
+<TGConnectingPoint num="19" id="1787" />
+<TGConnectingPoint num="20" id="1788" />
+<TGConnectingPoint num="21" id="1789" />
+<TGConnectingPoint num="22" id="1790" />
+<TGConnectingPoint num="23" id="1791" />
+<TGConnectingPoint num="24" id="1792" />
+<TGConnectingPoint num="25" id="1793" />
+<TGConnectingPoint num="26" id="1794" />
+<TGConnectingPoint num="27" id="1795" />
+<TGConnectingPoint num="28" id="1796" />
+<TGConnectingPoint num="29" id="1797" />
+<TGConnectingPoint num="30" id="1798" />
+<TGConnectingPoint num="31" id="1799" />
+<TGConnectingPoint num="32" id="1800" />
+<TGConnectingPoint num="33" id="1801" />
+<TGConnectingPoint num="34" id="1802" />
+<TGConnectingPoint num="35" id="1803" />
+<TGConnectingPoint num="36" id="1804" />
+<TGConnectingPoint num="37" id="1805" />
+<TGConnectingPoint num="38" id="1806" />
+<TGConnectingPoint num="39" id="1807" />
+<TGConnectingPoint num="40" id="1808" />
+<TGConnectingPoint num="41" id="1809" />
+<TGConnectingPoint num="42" id="1810" />
+<TGConnectingPoint num="43" id="1811" />
+<TGConnectingPoint num="44" id="1812" />
+<TGConnectingPoint num="45" id="1813" />
+<TGConnectingPoint num="46" id="1814" />
+<TGConnectingPoint num="47" id="1815" />
+<TGConnectingPoint num="48" id="1816" />
+<TGConnectingPoint num="49" id="1817" />
+<TGConnectingPoint num="50" id="1818" />
+<TGConnectingPoint num="51" id="1819" />
+<TGConnectingPoint num="52" id="1820" />
+<TGConnectingPoint num="53" id="1821" />
+<TGConnectingPoint num="54" id="1822" />
+<TGConnectingPoint num="55" id="1823" />
+<TGConnectingPoint num="56" id="1824" />
+<TGConnectingPoint num="57" id="1825" />
+<TGConnectingPoint num="58" id="1826" />
+<TGConnectingPoint num="59" id="1827" />
+<TGConnectingPoint num="60" id="1828" />
+<TGConnectingPoint num="61" id="1829" />
+<TGConnectingPoint num="62" id="1830" />
+<TGConnectingPoint num="63" id="1831" />
+<TGConnectingPoint num="64" id="1832" />
+<TGConnectingPoint num="65" id="1833" />
+<TGConnectingPoint num="66" id="1834" />
+<TGConnectingPoint num="67" id="1835" />
+<TGConnectingPoint num="68" id="1836" />
+<TGConnectingPoint num="69" id="1837" />
+<TGConnectingPoint num="70" id="1838" />
+<TGConnectingPoint num="71" id="1839" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5100" id="1842" index="10" uid="713f519e-f87f-489a-834c-8ddc7359e97a" >
 <cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
 <new d="false" />
-<TGConnectingPoint num="0" id="1804" />
+<TGConnectingPoint num="0" id="1841" />
 </COMPONENT>