diff --git a/Makefile b/Makefile
index 2be5c34152bf8da9da100dff02bb8cca77d744fb..e8c025d0bd05fbe0517747634a3c2574b818fd2b 100755
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ JAVADOC			= javadoc
 MAKE			= make -s
 TAR			= tar
 GZIP			= gzip
+GRADLE_NO_TEST          = -x test 
+GRADLE_OPTIONS          = --parallel
 GRADLE			= $(shell which gradle)
 GRADLE_VERSION_NEEDED	= 3.3
 ERROR_MSG		= printf "$(COLOR)\nBuild with gradle failed. Falling back to regular javac command...\n$(RESET)"
@@ -122,12 +124,16 @@ export WEBCRAWLER_SERVER_BINARY	= $(TTOOL_BUILD)/webcrawler-server.jar
 export JTTOOL_DIR		= $(TTOOL_PATH)/jttool
 export JTTOOL_BINARY		= $(TTOOL_BUILD)/jttool.jar
 
-all: ttool launcher ttool-cli graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler
+all: ttool launcher ttool-cli graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler install
+
+allnotest: GRADLE_OPTIONS += $(GRADLE_NO_TEST)
+allnotest: ttool launcher ttool-cli graphminimize graphshow tiftranslator tmltranslator rundse remotesimulator webcrawler install
 
 ttool: $(TTOOL_BINARY)
+ttoolnotest: 
 
 $(TTOOL_BINARY): FORCE
-	@($(GRADLE) :ttool:build) || ($(ERROR_MSG) $(GRADLE_VERSION) $(GRADLE_VERSION_NEEDED)&& $(MAKE) -C $(TTOOL_DIR) -e $@)
+	@($(GRADLE) :ttool:build $(GRADLE_OPTIONS)) || ($(ERROR_MSG) $(GRADLE_VERSION) $(GRADLE_VERSION_NEEDED)&& $(MAKE) -C $(TTOOL_DIR) -e $@)
 
 ttooljavac:
 	$(MAKE) -C $(TTOOL_DIR)
@@ -141,7 +147,7 @@ $(LAUNCHER_BINARY): FORCE
 ttool-cli: $(TTOOLCLI_BINARY)
 
 $(TTOOLCLI_BINARY): FORCE
-	@($(GRADLE) :ttool-cli:build) || ($(ERROR_MSG) && $(MAKE) -C $(TTOOLCLI_DIR) -e $@)
+	@($(GRADLE) :ttool-cli:build $(GRADLE_OPTIONS)) || ($(ERROR_MSG) && $(MAKE) -C $(TTOOLCLI_DIR) -e $@)
 
 graphminimize: $(GRAPHMINIMIZE_BINARY)
 
diff --git a/modeling/SysMLSec/DRA.xml b/modeling/SysMLSec/DRA.xml
index b013935a67ef45d8f8daaf746f7f57c35f64ef7d..fbab445b10c87565408bcfa64ac1bd95f53b1c9f 100644
--- a/modeling/SysMLSec/DRA.xml
+++ b/modeling/SysMLSec/DRA.xml
@@ -364,7 +364,7 @@
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="System;Server;Alice;Bob;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="145" >
@@ -510,11 +510,11 @@
 </COMPONENT>
 <SUBCOMPONENT type="5000" id="205" >
 <father id="280" num="0" />
-<cdparam x="410" y="327" />
-<sizeparam width="250" height="211" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="411" y="121" />
+<sizeparam width="248" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="280" minY="0" maxY="281" />
-<infoparam name="Block0" value="Bob" />
+<cdrectangleparam minX="0" maxX="282" minY="0" maxY="292" />
+<infoparam name="Block0" value="Server" />
 <TGConnectingPoint num="0" id="181" />
 <TGConnectingPoint num="1" id="182" />
 <TGConnectingPoint num="2" id="183" />
@@ -543,32 +543,7 @@
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
 <Attribute access="0" id="filler" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="tmp1" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="tmp2" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="tmp3" value="" type="8" typeOther="" />
-<Attribute access="0" id="tmp4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="m_cipher" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="curr_K_b" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="curr_Ks_b" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="next_K_b" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="next_Ks_b" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="curr_K_a" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="next_K_a" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="RK" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="N" value="" type="8" typeOther="" />
-<Attribute access="0" id="DH_sending" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="DH_receiving" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CK_sending" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="CK_receiving" value="" type="5" typeOther="Key" />
-<Attribute access="0" id="b" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="b_cipher" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler4" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler3" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="Next_Ks_b_2" value="" type="4" typeOther="" />
-<Attribute access="0" id="filler6" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="filler5" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="requestBobPublicKeyBundle" value="" type="5" typeOther="Message" />
 <Method value="Message aencrypt(Message msg, Key k)" />
 <Method value="Message adecrypt(Message msg, Key k)" />
 <Method value="Key pk(Key k)" />
@@ -680,11 +655,11 @@
 </SUBCOMPONENT>
 <SUBCOMPONENT type="5000" id="255" >
 <father id="280" num="2" />
-<cdparam x="411" y="121" />
-<sizeparam width="248" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="410" y="327" />
+<sizeparam width="250" height="211" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="282" minY="0" maxY="292" />
-<infoparam name="Block0" value="Server" />
+<cdrectangleparam minX="0" maxX="280" minY="0" maxY="281" />
+<infoparam name="Block0" value="Bob" />
 <TGConnectingPoint num="0" id="231" />
 <TGConnectingPoint num="1" id="232" />
 <TGConnectingPoint num="2" id="233" />
@@ -713,7 +688,32 @@
 <blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
 <Attribute access="0" id="filler" value="" type="5" typeOther="Message" />
-<Attribute access="0" id="requestBobPublicKeyBundle" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="tmp1" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="tmp2" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="tmp3" value="" type="8" typeOther="" />
+<Attribute access="0" id="tmp4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="m_cipher" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="curr_K_b" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="curr_Ks_b" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="next_K_b" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="next_Ks_b" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="curr_K_a" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="next_K_a" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="RK" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="N" value="" type="8" typeOther="" />
+<Attribute access="0" id="DH_sending" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="DH_receiving" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CK_sending" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="CK_receiving" value="" type="5" typeOther="Key" />
+<Attribute access="0" id="b" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="b_cipher" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler4" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler3" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="Next_Ks_b_2" value="" type="4" typeOther="" />
+<Attribute access="0" id="filler6" value="" type="5" typeOther="Message" />
+<Attribute access="0" id="filler5" value="" type="5" typeOther="Message" />
 <Method value="Message aencrypt(Message msg, Key k)" />
 <Method value="Message adecrypt(Message msg, Key k)" />
 <Method value="Key pk(Key k)" />
@@ -753,22 +753,22 @@
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
+<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="4000" >
 <CONNECTOR type="5102" id="289" >
-<cdparam x="409" y="158" />
+<cdparam x="312" y="226" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="288" />
-<P1  x="407" y="117" id="432" />
-<P2  x="407" y="136" id="391" />
+<P1  x="304" y="206" id="1150" />
+<P2  x="245" y="245" id="465" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="287" >
 <father id="289" num="0" />
-<cdparam x="407" y="187" />
+<cdparam x="265" y="248" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="283" />
 <TGConnectingPoint num="1" id="284" />
@@ -785,20 +785,20 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="296" >
-<cdparam x="407" y="70" />
+<cdparam x="312" y="67" />
 <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="295" />
-<P1  x="407" y="70" id="442" />
-<P2  x="407" y="87" id="431" />
+<P1  x="312" y="67" id="1160" />
+<P2  x="312" y="90" id="468" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="294" >
 <father id="296" num="0" />
-<cdparam x="416" y="103" />
+<cdparam x="327" y="95" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="290" />
 <TGConnectingPoint num="1" id="291" />
@@ -815,20 +815,20 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="303" >
-<cdparam x="395" y="270" />
+<cdparam x="378" y="269" />
 <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="302" />
-<P1  x="407" y="166" id="396" />
-<P2  x="407" y="186" id="379" />
+<P1  x="266" y="389" id="472" />
+<P2  x="281" y="408" id="1136" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="301" >
 <father id="303" num="0" />
-<cdparam x="398" y="298" />
+<cdparam x="379" y="311" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="297" />
 <TGConnectingPoint num="1" id="298" />
@@ -845,20 +845,20 @@
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="310" >
-<cdparam x="391" y="366" />
+<cdparam x="404" y="170" />
 <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="309" />
-<P1  x="407" y="216" id="380" />
-<P2  x="407" y="251" id="339" />
+<P1  x="245" y="275" id="466" />
+<P2  x="266" y="359" id="471" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="308" >
 <father id="310" num="0" />
-<cdparam x="394" y="377" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="309" y="301" />
+<sizeparam width="204" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="304" />
 <TGConnectingPoint num="1" id="305" />
@@ -871,24 +871,28 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="next_Ks_b.Key = tmp3" enabled="true"/>
+<actions value="next_K_b=pk(next_Ks_b) " enabled="true"/>
+<actions value="tmp2.Message =  next_K_b.Key" enabled="true"/>
+<actions value="filler2.Message = tmp2.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="317" >
-<cdparam x="396" y="458" />
+<cdparam x="265" y="2904" />
 <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="316" />
-<P1  x="407" y="281" id="344" />
-<P2  x="407" y="309" id="327" />
+<P1  x="266" y="3120" id="529" />
+<P2  x="249" y="3242" id="483" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="315" >
 <father id="317" num="0" />
-<cdparam x="396" y="497" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="272" y="3188" />
+<sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="311" />
 <TGConnectingPoint num="1" id="312" />
@@ -901,24 +905,25 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="m = sdecrypt(m_cipher, CK_receiving) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
 <CONNECTOR type="5102" id="324" >
-<cdparam x="389" y="553" />
+<cdparam x="258" y="2757" />
 <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="323" />
-<P1  x="407" y="339" id="328" />
-<P2  x="407" y="362" id="325" />
+<P1  x="219" y="2826" id="570" />
+<P2  x="266" y="3070" id="524" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="322" >
 <father id="324" num="0" />
-<cdparam x="395" y="596" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="265" y="2930" />
+<sizeparam width="212" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="318" />
 <TGConnectingPoint num="1" id="319" />
@@ -931,210 +936,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="tmp1.Message = CK_receiving.Key" enabled="true"/>
+<actions value="tmp4 = hash(tmp1)" enabled="true"/>
+<actions value="CK_receiving.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5101" id="326" >
-<cdparam x="397" y="367" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="325" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="337" >
-<cdparam x="366" y="314" />
-<sizeparam width="82" height="20" minWidth="30" minHeight="0" 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="Send signal" value="chout(filler)" />
-<TGConnectingPoint num="0" id="327" />
-<TGConnectingPoint num="1" id="328" />
-<TGConnectingPoint num="2" id="329" />
-<TGConnectingPoint num="3" id="330" />
-<TGConnectingPoint num="4" id="331" />
-<TGConnectingPoint num="5" id="332" />
-<TGConnectingPoint num="6" id="333" />
-<TGConnectingPoint num="7" id="334" />
-<TGConnectingPoint num="8" id="335" />
-<TGConnectingPoint num="9" id="336" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="378" >
-<cdparam x="314" y="251" />
-<sizeparam width="186" height="30" 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="State" value="Receive_Alice_request" />
-<TGConnectingPoint num="0" id="338" />
-<TGConnectingPoint num="1" id="339" />
-<TGConnectingPoint num="2" id="340" />
-<TGConnectingPoint num="3" id="341" />
-<TGConnectingPoint num="4" id="342" />
-<TGConnectingPoint num="5" id="343" />
-<TGConnectingPoint num="6" id="344" />
-<TGConnectingPoint num="7" id="345" />
-<TGConnectingPoint num="8" id="346" />
-<TGConnectingPoint num="9" id="347" />
-<TGConnectingPoint num="10" id="348" />
-<TGConnectingPoint num="11" id="349" />
-<TGConnectingPoint num="12" id="350" />
-<TGConnectingPoint num="13" id="351" />
-<TGConnectingPoint num="14" id="352" />
-<TGConnectingPoint num="15" id="353" />
-<TGConnectingPoint num="16" id="354" />
-<TGConnectingPoint num="17" id="355" />
-<TGConnectingPoint num="18" id="356" />
-<TGConnectingPoint num="19" id="357" />
-<TGConnectingPoint num="20" id="358" />
-<TGConnectingPoint num="21" id="359" />
-<TGConnectingPoint num="22" id="360" />
-<TGConnectingPoint num="23" id="361" />
-<TGConnectingPoint num="24" id="362" />
-<TGConnectingPoint num="25" id="363" />
-<TGConnectingPoint num="26" id="364" />
-<TGConnectingPoint num="27" id="365" />
-<TGConnectingPoint num="28" id="366" />
-<TGConnectingPoint num="29" id="367" />
-<TGConnectingPoint num="30" id="368" />
-<TGConnectingPoint num="31" id="369" />
-<TGConnectingPoint num="32" id="370" />
-<TGConnectingPoint num="33" id="371" />
-<TGConnectingPoint num="34" id="372" />
-<TGConnectingPoint num="35" id="373" />
-<TGConnectingPoint num="36" id="374" />
-<TGConnectingPoint num="37" id="375" />
-<TGConnectingPoint num="38" id="376" />
-<TGConnectingPoint num="39" id="377" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="389" >
-<cdparam x="293" y="191" />
-<sizeparam width="228" height="20" minWidth="30" minHeight="0" 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="Receive signal" value="chin(requestBobPublicKeyBundle)" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<TGConnectingPoint num="2" id="381" />
-<TGConnectingPoint num="3" id="382" />
-<TGConnectingPoint num="4" id="383" />
-<TGConnectingPoint num="5" id="384" />
-<TGConnectingPoint num="6" id="385" />
-<TGConnectingPoint num="7" id="386" />
-<TGConnectingPoint num="8" id="387" />
-<TGConnectingPoint num="9" id="388" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="430" >
-<cdparam x="376" y="136" />
-<sizeparam width="63" height="30" 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="State" value="Store" />
-<TGConnectingPoint num="0" id="390" />
-<TGConnectingPoint num="1" id="391" />
-<TGConnectingPoint num="2" id="392" />
-<TGConnectingPoint num="3" id="393" />
-<TGConnectingPoint num="4" id="394" />
-<TGConnectingPoint num="5" id="395" />
-<TGConnectingPoint num="6" id="396" />
-<TGConnectingPoint num="7" id="397" />
-<TGConnectingPoint num="8" id="398" />
-<TGConnectingPoint num="9" id="399" />
-<TGConnectingPoint num="10" id="400" />
-<TGConnectingPoint num="11" id="401" />
-<TGConnectingPoint num="12" id="402" />
-<TGConnectingPoint num="13" id="403" />
-<TGConnectingPoint num="14" id="404" />
-<TGConnectingPoint num="15" id="405" />
-<TGConnectingPoint num="16" id="406" />
-<TGConnectingPoint num="17" id="407" />
-<TGConnectingPoint num="18" id="408" />
-<TGConnectingPoint num="19" id="409" />
-<TGConnectingPoint num="20" id="410" />
-<TGConnectingPoint num="21" id="411" />
-<TGConnectingPoint num="22" id="412" />
-<TGConnectingPoint num="23" id="413" />
-<TGConnectingPoint num="24" id="414" />
-<TGConnectingPoint num="25" id="415" />
-<TGConnectingPoint num="26" id="416" />
-<TGConnectingPoint num="27" id="417" />
-<TGConnectingPoint num="28" id="418" />
-<TGConnectingPoint num="29" id="419" />
-<TGConnectingPoint num="30" id="420" />
-<TGConnectingPoint num="31" id="421" />
-<TGConnectingPoint num="32" id="422" />
-<TGConnectingPoint num="33" id="423" />
-<TGConnectingPoint num="34" id="424" />
-<TGConnectingPoint num="35" id="425" />
-<TGConnectingPoint num="36" id="426" />
-<TGConnectingPoint num="37" id="427" />
-<TGConnectingPoint num="38" id="428" />
-<TGConnectingPoint num="39" id="429" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5104" id="441" >
-<cdparam x="367" y="92" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" 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="Receive signal" value="chin(filler)" />
-<TGConnectingPoint num="0" id="431" />
-<TGConnectingPoint num="1" id="432" />
-<TGConnectingPoint num="2" id="433" />
-<TGConnectingPoint num="3" id="434" />
-<TGConnectingPoint num="4" id="435" />
-<TGConnectingPoint num="5" id="436" />
-<TGConnectingPoint num="6" id="437" />
-<TGConnectingPoint num="7" id="438" />
-<TGConnectingPoint num="8" id="439" />
-<TGConnectingPoint num="9" id="440" />
-</COMPONENT>
-
-<COMPONENT type="5100" id="443" >
-<cdparam x="400" y="50" />
-<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="442" />
-</COMPONENT>
-
-
-</AVATARStateMachineDiagramPanel>
-
-<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="4000" >
-<CONNECTOR type="5102" id="450" >
-<cdparam x="407" y="118" />
+<CONNECTOR type="5102" id="331" >
+<cdparam x="267" y="2631" />
 <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="449" />
-<P1  x="407" y="118" id="1425" />
-<P2  x="406" y="137" id="647" />
+<TGConnectingPoint num="0" id="330" />
+<P1  x="267" y="2631" id="611" />
+<P2  x="219" y="2776" id="565" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="448" >
-<father id="450" num="0" />
-<cdparam x="358" y="130" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="329" >
+<father id="331" num="0" />
+<cdparam x="266" y="2658" />
+<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="444" />
-<TGConnectingPoint num="1" id="445" />
-<TGConnectingPoint num="2" id="446" />
-<TGConnectingPoint num="3" id="447" />
+<TGConnectingPoint num="0" id="325" />
+<TGConnectingPoint num="1" id="326" />
+<TGConnectingPoint num="2" id="327" />
+<TGConnectingPoint num="3" id="328" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1142,29 +969,35 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="tmp1.Message = RK.Key" enabled="true"/>
+<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
+<actions value="tmp1=hash(tmp4)" enabled="true"/>
+<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
+<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="457" >
-<cdparam x="207" y="3397" />
+<CONNECTOR type="5102" id="338" >
+<cdparam x="272" y="2380" />
 <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="456" />
-<P1  x="406" y="2436" id="708" />
-<P2  x="406" y="2523" id="662" />
+<TGConnectingPoint num="0" id="337" />
+<P1  x="196" y="2322" id="688" />
+<P2  x="250" y="2440" id="647" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="455" >
-<father id="457" num="0" />
-<cdparam x="429" y="2457" />
-<sizeparam width="266" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="336" >
+<father id="338" num="0" />
+<cdparam x="254" y="2350" />
+<sizeparam width="265" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="451" />
-<TGConnectingPoint num="1" id="452" />
-<TGConnectingPoint num="2" id="453" />
-<TGConnectingPoint num="3" id="454" />
+<TGConnectingPoint num="0" id="332" />
+<TGConnectingPoint num="1" id="333" />
+<TGConnectingPoint num="2" id="334" />
+<TGConnectingPoint num="3" id="335" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1172,33 +1005,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_K_a = pk(next_Ks_a) " enabled="true"/>
-<actions value="tmp1.Message = next_K_a.Key" enabled="true"/>
-<actions value="tmp2.Message = curr_K_a.Key " enabled="true"/>
-<actions value="filler6 = concat4(tmp1,tmp2, 1, a2_cipher)" enabled="true"/>
+<actions value="get4(filler3, tmp1 ,tmp2, tmp4 , m_cipher) " enabled="true"/>
+<actions value="next_K_a.Key = tmp1.Message" enabled="true"/>
+<actions value="curr_K_a.Key = tmp2.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="464" >
-<cdparam x="140" y="2457" />
+<CONNECTOR type="5102" id="345" >
+<cdparam x="292" y="2219" />
 <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="463" />
-<P1  x="406" y="1895" id="790" />
-<P2  x="406" y="1922" id="828" />
+<TGConnectingPoint num="0" id="344" />
+<P1  x="288" y="2170" id="699" />
+<P2  x="246" y="2226" id="701" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="462" >
-<father id="464" num="0" />
-<cdparam x="162" y="2473" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="343" >
+<father id="345" num="0" />
+<cdparam x="319" y="2191" />
+<sizeparam width="204" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="458" />
-<TGConnectingPoint num="1" id="459" />
-<TGConnectingPoint num="2" id="460" />
-<TGConnectingPoint num="3" id="461" />
+<TGConnectingPoint num="0" id="339" />
+<TGConnectingPoint num="1" id="340" />
+<TGConnectingPoint num="2" id="341" />
+<TGConnectingPoint num="3" id="342" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1206,29 +1038,33 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="next_Ks_b.Key = tmp3" enabled="true"/>
+<actions value="next_K_b = pk(curr_Ks_b) " enabled="true"/>
+<actions value="tmp1.Message = next_K_b.Key" enabled="true"/>
+<actions value="filler5.Message = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="471" >
-<cdparam x="129" y="2503" />
+<CONNECTOR type="5102" id="352" >
+<cdparam x="257" y="1734" />
 <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="470" />
-<P1  x="406" y="2017" id="826" />
-<P2  x="406" y="2078" id="881" />
+<TGConnectingPoint num="0" id="351" />
+<P1  x="224" y="1716" id="814" />
+<P2  x="276" y="1786" id="768" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="469" >
-<father id="471" num="0" />
-<cdparam x="420" y="2040" />
-<sizeparam width="255" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="350" >
+<father id="352" num="0" />
+<cdparam x="289" y="1737" />
+<sizeparam width="226" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="465" />
-<TGConnectingPoint num="1" id="466" />
-<TGConnectingPoint num="2" id="467" />
-<TGConnectingPoint num="3" id="468" />
+<TGConnectingPoint num="0" id="346" />
+<TGConnectingPoint num="1" id="347" />
+<TGConnectingPoint num="2" id="348" />
+<TGConnectingPoint num="3" id="349" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1236,31 +1072,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value=" next_Ks_a.Key = tmp3" enabled="true"/>
-<actions value=" DH_sending =  DH( next_K_b,next_Ks_a) " enabled="true"/>
+<actions value="b_cipher = sencrypt(b, CK_sending) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="478" >
-<cdparam x="213" y="2462" />
+<CONNECTOR type="5102" id="359" >
+<cdparam x="247" y="1591" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="477" />
-<P1  x="406" y="1952" id="829" />
-<P2  x="406" y="1987" id="825" />
+<TGConnectingPoint num="0" id="358" />
+<P1  x="247" y="1591" id="855" />
+<P2  x="224" y="1666" id="809" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="476" >
-<father id="478" num="0" />
-<cdparam x="428" y="1970" />
-<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="357" >
+<father id="359" num="0" />
+<cdparam x="280" y="1646" />
+<sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="472" />
-<TGConnectingPoint num="1" id="473" />
-<TGConnectingPoint num="2" id="474" />
-<TGConnectingPoint num="3" id="475" />
+<TGConnectingPoint num="0" id="353" />
+<TGConnectingPoint num="1" id="354" />
+<TGConnectingPoint num="2" id="355" />
+<TGConnectingPoint num="3" id="356" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1268,30 +1103,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_K_b.Key = filler5.Message" enabled="true"/>
+<actions value="m = sdecrypt(m_cipher, CK_receiving) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="485" >
-<cdparam x="162" y="2361" />
+<CONNECTOR type="5102" id="366" >
+<cdparam x="267" y="1376" />
 <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="484" />
-<P1  x="406" y="1755" id="930" />
-<P2  x="406" y="1865" id="785" />
+<TGConnectingPoint num="0" id="365" />
+<P1  x="265" y="1425" id="896" />
+<P2  x="247" y="1541" id="850" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="483" >
-<father id="485" num="0" />
-<cdparam x="426" y="1777" />
-<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="364" >
+<father id="366" num="0" />
+<cdparam x="271" y="1470" />
+<sizeparam width="206" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="479" />
-<TGConnectingPoint num="1" id="480" />
-<TGConnectingPoint num="2" id="481" />
-<TGConnectingPoint num="3" id="482" />
+<TGConnectingPoint num="0" id="360" />
+<TGConnectingPoint num="1" id="361" />
+<TGConnectingPoint num="2" id="362" />
+<TGConnectingPoint num="3" id="363" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1299,35 +1134,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = RK.Key" enabled="true"/>
-<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
-<actions value="tmp1=hash(tmp4)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
-<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
+<actions value="tmp1.Message = CK_sending.Key" enabled="true"/>
+<actions value="tmp4 = hash(tmp1)" enabled="true"/>
+<actions value="CK_sending.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="492" >
-<cdparam x="251" y="2129" />
+<CONNECTOR type="5102" id="373" >
+<cdparam x="272" y="1281" />
 <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="491" />
-<P1  x="406" y="1600" id="973" />
-<P2  x="406" y="1628" id="921" />
+<TGConnectingPoint num="0" id="372" />
+<P1  x="272" y="1281" id="937" />
+<P2  x="265" y="1375" id="891" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="490" >
-<father id="492" num="0" />
-<cdparam x="228" y="2148" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="371" >
+<father id="373" num="0" />
+<cdparam x="286" y="1320" />
+<sizeparam width="212" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="486" />
-<TGConnectingPoint num="1" id="487" />
-<TGConnectingPoint num="2" id="488" />
-<TGConnectingPoint num="3" id="489" />
+<TGConnectingPoint num="0" id="367" />
+<TGConnectingPoint num="1" id="368" />
+<TGConnectingPoint num="2" id="369" />
+<TGConnectingPoint num="3" id="370" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1335,29 +1167,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="tmp1.Message = CK_receiving.Key" enabled="true"/>
+<actions value="tmp4 = hash(tmp1)" enabled="true"/>
+<actions value="CK_receiving.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="499" >
-<cdparam x="274" y="1973" />
+<CONNECTOR type="5102" id="380" >
+<cdparam x="344" y="931" />
 <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="498" />
-<P1  x="406" y="1512" id="1014" />
-<P2  x="406" y="1570" id="968" />
+<TGConnectingPoint num="0" id="379" />
+<P1  x="350" y="859" id="1019" />
+<P2  x="329" y="1051" id="973" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="497" >
-<father id="499" num="0" />
-<cdparam x="423" y="1548" />
-<sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="378" >
+<father id="380" num="0" />
+<cdparam x="375" y="990" />
+<sizeparam width="257" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="493" />
-<TGConnectingPoint num="1" id="494" />
-<TGConnectingPoint num="2" id="495" />
-<TGConnectingPoint num="3" id="496" />
+<TGConnectingPoint num="0" id="374" />
+<TGConnectingPoint num="1" id="375" />
+<TGConnectingPoint num="2" id="376" />
+<TGConnectingPoint num="3" id="377" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1365,30 +1200,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="m = sdecrypt(m_cipher, CK_receiving) " enabled="true"/>
+<actions value="DH_receiving = DH(next_K_a , next_Ks_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="506" >
-<cdparam x="272" y="1722" />
+<CONNECTOR type="5102" id="387" >
+<cdparam x="373" y="710" />
 <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="505" />
-<P1  x="406" y="1373" id="1061" />
-<P2  x="406" y="1396" id="1049" />
+<TGConnectingPoint num="0" id="386" />
+<P1  x="368" y="676" id="1060" />
+<P2  x="350" y="809" id="1014" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="504" >
-<father id="506" num="0" />
-<cdparam x="266" y="1767" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="385" >
+<father id="387" num="0" />
+<cdparam x="395" y="699" />
+<sizeparam width="209" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="500" />
-<TGConnectingPoint num="1" id="501" />
-<TGConnectingPoint num="2" id="502" />
-<TGConnectingPoint num="3" id="503" />
+<TGConnectingPoint num="0" id="381" />
+<TGConnectingPoint num="1" id="382" />
+<TGConnectingPoint num="2" id="383" />
+<TGConnectingPoint num="3" id="384" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1396,29 +1231,34 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="tmp1.Message = RK.Key" enabled="true"/>
+<actions value="tmp2.Message = DH_sending.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
+<actions value="tmp1=hash(tmp4)" enabled="true"/>
+<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="513" >
-<cdparam x="272" y="1469" />
+<CONNECTOR type="5102" id="394" >
+<cdparam x="379" y="537" />
 <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="512" />
-<P1  x="406" y="1184" id="1118" />
-<P2  x="406" y="1283" id="1072" />
+<TGConnectingPoint num="0" id="393" />
+<P1  x="379" y="537" id="1101" />
+<P2  x="368" y="626" id="1055" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="511" >
-<father id="513" num="0" />
-<cdparam x="428" y="1215" />
-<sizeparam width="258" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="392" >
+<father id="394" num="0" />
+<cdparam x="405" y="588" />
+<sizeparam width="247" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="507" />
-<TGConnectingPoint num="1" id="508" />
-<TGConnectingPoint num="2" id="509" />
-<TGConnectingPoint num="3" id="510" />
+<TGConnectingPoint num="0" id="388" />
+<TGConnectingPoint num="1" id="389" />
+<TGConnectingPoint num="2" id="390" />
+<TGConnectingPoint num="3" id="391" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1426,33 +1266,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_K_a = pk(next_Ks_a) " enabled="true"/>
-<actions value="tmp1.Message = next_K_a.Key" enabled="true"/>
-<actions value="tmp2.Message = curr_K_a.Key " enabled="true"/>
-<actions value="filler3 = concat4(tmp1,tmp2, 1, a_cipher)" enabled="true"/>
+<actions value="DH_sending = DH(curr_K_a , curr_Ks_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="520" >
-<cdparam x="261" y="1337" />
+<CONNECTOR type="5102" id="401" >
+<cdparam x="381" y="383" />
 <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="519" />
-<P1  x="406" y="1094" id="1173" />
-<P2  x="406" y="1154" id="1113" />
+<TGConnectingPoint num="0" id="400" />
+<P1  x="281" y="438" id="1137" />
+<P2  x="379" y="487" id="1096" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="518" >
-<father id="520" num="0" />
-<cdparam x="427" y="1127" />
-<sizeparam width="226" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="399" >
+<father id="401" num="0" />
+<cdparam x="362" y="438" />
+<sizeparam width="242" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="514" />
-<TGConnectingPoint num="1" id="515" />
-<TGConnectingPoint num="2" id="516" />
-<TGConnectingPoint num="3" id="517" />
+<TGConnectingPoint num="0" id="395" />
+<TGConnectingPoint num="1" id="396" />
+<TGConnectingPoint num="2" id="397" />
+<TGConnectingPoint num="3" id="398" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1460,30 +1297,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="a_cipher = sencrypt(a, CK_sending) " enabled="true"/>
+<actions value="get4(filler3, tmp1 ,tmp2, N , m_cipher) " enabled="true"/>
+<actions value="next_K_a.Key = tmp1.Message" enabled="true"/>
+<actions value="curr_K_a.Key = tmp2.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="527" >
-<cdparam x="254" y="692" />
+<CONNECTOR type="5102" id="408" >
+<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="526" />
-<P1  x="406" y="627" id="1154" />
-<P2  x="406" y="688" id="1291" />
+<TGConnectingPoint num="0" id="407" />
+<P1  x="312" y="120" id="469" />
+<P2  x="304" y="176" id="1149" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="525" >
-<father id="527" num="0" />
-<cdparam x="428" y="652" />
-<sizeparam width="255" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="406" >
+<father id="408" num="0" />
+<cdparam x="339" y="138" />
+<sizeparam width="196" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="521" />
-<TGConnectingPoint num="1" id="522" />
-<TGConnectingPoint num="2" id="523" />
-<TGConnectingPoint num="3" id="524" />
+<TGConnectingPoint num="0" id="402" />
+<TGConnectingPoint num="1" id="403" />
+<TGConnectingPoint num="2" id="404" />
+<TGConnectingPoint num="3" id="405" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1491,31 +1330,33 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value=" next_Ks_a.Key = tmp3" enabled="true"/>
-<actions value=" DH_sending =  DH( next_K_b,next_Ks_a) " enabled="true"/>
+<actions value="curr_Ks_b.Key = tmp3" enabled="true"/>
+<actions value="curr_K_b=pk(curr_Ks_b) " enabled="true"/>
+<actions value="tmp1.Message = curr_K_b.Key" enabled="true"/>
+<actions value="filler.Message = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="534" >
-<cdparam x="369" y="597" />
+<CONNECTOR type="5102" id="415" >
+<cdparam x="291" y="1101" />
 <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="533" />
-<P1  x="406" y="559" id="1157" />
-<P2  x="406" y="597" id="1153" />
+<TGConnectingPoint num="0" id="414" />
+<P1  x="291" y="1101" id="1001" />
+<P2  x="272" y="1231" id="932" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="532" >
-<father id="534" num="0" />
-<cdparam x="429" y="584" />
-<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="413" >
+<father id="415" num="0" />
+<cdparam x="324" y="1131" />
+<sizeparam width="215" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="528" />
-<TGConnectingPoint num="1" id="529" />
-<TGConnectingPoint num="2" id="530" />
-<TGConnectingPoint num="3" id="531" />
+<TGConnectingPoint num="0" id="409" />
+<TGConnectingPoint num="1" id="410" />
+<TGConnectingPoint num="2" id="411" />
+<TGConnectingPoint num="3" id="412" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1523,30 +1364,34 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_K_b.Key = filler2.Message" enabled="true"/>
+<actions value="tmp1.Message = DH_receiving.Key" enabled="true"/>
+<actions value="tmp2.Message = CK_sending.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
+<actions value="tmp1 = hash(tmp4)" enabled="true"/>
+<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="541" >
-<cdparam x="380" y="515" />
+<CONNECTOR type="5102" id="422" >
+<cdparam x="319" y="2061" />
 <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="540" />
-<P1  x="406" y="503" id="1337" />
-<P2  x="406" y="529" id="1156" />
+<TGConnectingPoint num="0" id="421" />
+<P1  x="319" y="2061" id="756" />
+<P2  x="296" y="2087" id="715" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="539" >
-<father id="541" num="0" />
-<cdparam x="374" y="541" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="420" >
+<father id="422" num="0" />
+<cdparam x="315" y="2096" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="535" />
-<TGConnectingPoint num="1" id="536" />
-<TGConnectingPoint num="2" id="537" />
-<TGConnectingPoint num="3" id="538" />
+<TGConnectingPoint num="0" id="416" />
+<TGConnectingPoint num="1" id="417" />
+<TGConnectingPoint num="2" id="418" />
+<TGConnectingPoint num="3" id="419" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1557,26 +1402,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="548" >
-<cdparam x="341" y="997" />
+<CONNECTOR type="5102" id="429" >
+<cdparam x="312" y="2162" />
 <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="547" />
-<P1  x="406" y="961" id="1214" />
-<P2  x="406" y="1064" id="1168" />
+<TGConnectingPoint num="0" id="428" />
+<P1  x="296" y="2117" id="716" />
+<P2  x="288" y="2140" id="698" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="546" >
-<father id="548" num="0" />
-<cdparam x="427" y="1001" />
-<sizeparam width="206" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="427" >
+<father id="429" num="0" />
+<cdparam x="305" y="2191" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="542" />
-<TGConnectingPoint num="1" id="543" />
-<TGConnectingPoint num="2" id="544" />
-<TGConnectingPoint num="3" id="545" />
+<TGConnectingPoint num="0" id="423" />
+<TGConnectingPoint num="1" id="424" />
+<TGConnectingPoint num="2" id="425" />
+<TGConnectingPoint num="3" id="426" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1584,32 +1429,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = CK_sending.Key" enabled="true"/>
-<actions value="tmp4 = hash(tmp1)" enabled="true"/>
-<actions value="CK_sending.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="555" >
-<cdparam x="359" y="868" />
+<CONNECTOR type="5102" id="436" >
+<cdparam x="357" y="1846" />
 <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="554" />
-<P1  x="406" y="851" id="1255" />
-<P2  x="406" y="931" id="1209" />
+<TGConnectingPoint num="0" id="435" />
+<P1  x="362" y="1836" id="798" />
+<P2  x="280" y="1859" id="712" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="553" >
-<father id="555" num="0" />
-<cdparam x="431" y="879" />
-<sizeparam width="212" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="434" >
+<father id="436" num="0" />
+<cdparam x="353" y="1867" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="549" />
-<TGConnectingPoint num="1" id="550" />
-<TGConnectingPoint num="2" id="551" />
-<TGConnectingPoint num="3" id="552" />
+<TGConnectingPoint num="0" id="430" />
+<TGConnectingPoint num="1" id="431" />
+<TGConnectingPoint num="2" id="432" />
+<TGConnectingPoint num="3" id="433" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1617,32 +1459,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = CK_receiving.Key" enabled="true"/>
-<actions value="tmp4 = hash(tmp1)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="562" >
-<cdparam x="377" y="734" />
+<CONNECTOR type="5102" id="443" >
+<cdparam x="350" y="1919" />
 <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="561" />
-<P1  x="406" y="718" id="1296" />
-<P2  x="406" y="821" id="1250" />
+<TGConnectingPoint num="0" id="442" />
+<P1  x="280" y="1889" id="713" />
+<P2  x="350" y="2011" id="735" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="560" >
-<father id="562" num="0" />
-<cdparam x="432" y="736" />
-<sizeparam width="212" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="441" >
+<father id="443" num="0" />
+<cdparam x="331" y="1924" />
+<sizeparam width="226" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="556" />
-<TGConnectingPoint num="1" id="557" />
-<TGConnectingPoint num="2" id="558" />
-<TGConnectingPoint num="3" id="559" />
+<TGConnectingPoint num="0" id="437" />
+<TGConnectingPoint num="1" id="438" />
+<TGConnectingPoint num="2" id="439" />
+<TGConnectingPoint num="3" id="440" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1650,35 +1489,33 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = DH_sending.Key" enabled="true"/>
-<actions value="tmp2.Message = CK_receiving.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
-<actions value="tmp1 = hash(tmp4)" enabled="true"/>
-<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
-<actions value="RK.Key = CK_sending.Key" enabled="true"/>
+<actions value="curr_Ks_b.Key = tmp3" enabled="true"/>
+<actions value="curr_K_b = pk(curr_Ks_b) " enabled="true"/>
+<actions value="tmp1.Message = curr_K_b.Key" enabled="true"/>
+<actions value="filler4 = concat3(tmp1, 2, b_cipher) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="569" >
-<cdparam x="396" y="427" />
+<CONNECTOR type="5102" id="450" >
+<cdparam x="275" y="2294" />
 <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="568" />
-<P1  x="406" y="338" id="1378" />
-<P2  x="406" y="473" id="1332" />
+<TGConnectingPoint num="0" id="449" />
+<P1  x="246" y="2256" id="702" />
+<P2  x="196" y="2292" id="687" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="567" >
-<father id="569" num="0" />
-<cdparam x="425" y="373" />
-<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="448" >
+<father id="450" num="0" />
+<cdparam x="284" y="2340" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="563" />
-<TGConnectingPoint num="1" id="564" />
-<TGConnectingPoint num="2" id="565" />
-<TGConnectingPoint num="3" id="566" />
+<TGConnectingPoint num="0" id="444" />
+<TGConnectingPoint num="1" id="445" />
+<TGConnectingPoint num="2" id="446" />
+<TGConnectingPoint num="3" id="447" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1686,35 +1523,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = RK.Key" enabled="true"/>
-<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
-<actions value="tmp1=hash(tmp4)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
-<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="576" >
-<cdparam x="403" y="265" />
+<CONNECTOR type="5102" id="457" >
+<cdparam x="287" y="2490" />
 <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="575" />
-<P1  x="406" y="236" id="1414" />
-<P2  x="406" y="308" id="1373" />
+<TGConnectingPoint num="0" id="456" />
+<P1  x="250" y="2490" id="652" />
+<P2  x="267" y="2581" id="606" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="574" >
-<father id="576" num="0" />
-<cdparam x="428" y="266" />
-<sizeparam width="249" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="455" >
+<father id="457" num="0" />
+<cdparam x="276" y="2529" />
+<sizeparam width="257" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="570" />
-<TGConnectingPoint num="1" id="571" />
-<TGConnectingPoint num="2" id="572" />
-<TGConnectingPoint num="3" id="573" />
+<TGConnectingPoint num="0" id="451" />
+<TGConnectingPoint num="1" id="452" />
+<TGConnectingPoint num="2" id="453" />
+<TGConnectingPoint num="3" id="454" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1722,31 +1553,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="curr_K_b.Key = filler.Message" enabled="true"/>
-<actions value="DH_receiving = DH(curr_K_b, curr_Ks_a) " enabled="true"/>
+<actions value="DH_receiving = DH(next_K_a , next_Ks_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="583" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="464" >
+<cdparam x="246" y="3078" />
 <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="582" />
-<P1  x="407" y="70" id="1435" />
-<P2  x="407" y="88" id="1424" />
+<TGConnectingPoint num="0" id="463" />
+<P1  x="249" y="3292" id="488" />
+<P2  x="229" y="3428" id="1147" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="581" >
-<father id="583" num="0" />
-<cdparam x="416" y="91" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="462" >
+<father id="464" num="0" />
+<cdparam x="245" y="3126" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="577" />
-<TGConnectingPoint num="1" id="578" />
-<TGConnectingPoint num="2" id="579" />
-<TGConnectingPoint num="3" id="580" />
+<TGConnectingPoint num="0" id="458" />
+<TGConnectingPoint num="1" id="459" />
+<TGConnectingPoint num="2" id="460" />
+<TGConnectingPoint num="3" id="461" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -1757,1391 +1587,983 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="590" >
-<cdparam x="408" y="166" />
-<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="589" />
-<P1  x="406" y="167" id="648" />
-<P2  x="406" y="206" id="1413" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="588" >
-<father id="590" num="0" />
-<cdparam x="428" y="183" />
-<sizeparam width="150" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="467" >
+<cdparam x="164" y="250" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="584" />
-<TGConnectingPoint num="1" id="585" />
-<TGConnectingPoint num="2" id="586" />
-<TGConnectingPoint num="3" id="587" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="465" />
+<TGConnectingPoint num="1" id="466" />
 <extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="curr_Ks_a.Key = tmp3" enabled="true"/>
-<actions value="curr_K_a=pk(curr_Ks_a) " enabled="true"/>
+<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
-</SUBCOMPONENT>
+</COMPONENT>
 
-<CONNECTOR type="5102" id="597" >
-<cdparam x="274" y="1618" />
-<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="596" />
-<P1  x="406" y="1313" id="1077" />
-<P2  x="406" y="1343" id="1060" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="595" >
-<father id="597" num="0" />
-<cdparam x="276" y="1663" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="470" >
+<cdparam x="231" y="95" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="591" />
-<TGConnectingPoint num="1" id="592" />
-<TGConnectingPoint num="2" id="593" />
-<TGConnectingPoint num="3" id="594" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="604" >
-<cdparam x="260" y="1843" />
-<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="603" />
-<P1  x="406" y="1426" id="1050" />
-<P2  x="406" y="1482" id="1009" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="602" >
-<father id="604" num="0" />
-<cdparam x="423" y="1453" />
-<sizeparam width="221" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="598" />
-<TGConnectingPoint num="1" id="599" />
-<TGConnectingPoint num="2" id="600" />
-<TGConnectingPoint num="3" id="601" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="get3(filler4, tmp1, tmp2, m_cipher) " enabled="true"/>
-<actions value="curr_K_b.Key = tmp1.Message" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="611" >
-<cdparam x="330" y="2129" />
-<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="610" />
-<P1  x="406" y="1658" id="922" />
-<P2  x="406" y="1725" id="925" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="609" >
-<father id="611" num="0" />
-<cdparam x="426" y="1677" />
-<sizeparam width="249" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="605" />
-<TGConnectingPoint num="1" id="606" />
-<TGConnectingPoint num="2" id="607" />
-<TGConnectingPoint num="3" id="608" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="curr_Ks_a.Key = tmp3" enabled="true"/>
-<actions value="curr_K_a = pk(curr_Ks_a) " enabled="true"/>
-<actions value="DH_receiving = DH(curr_K_b, curr_Ks_a) " enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="618" >
-<cdparam x="190" y="2437" />
-<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="617" />
-<P1  x="406" y="2108" id="886" />
-<P2  x="406" y="2223" id="840" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="616" >
-<father id="618" num="0" />
-<cdparam x="427" y="2128" />
-<sizeparam width="212" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="612" />
-<TGConnectingPoint num="1" id="613" />
-<TGConnectingPoint num="2" id="614" />
-<TGConnectingPoint num="3" id="615" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="tmp1.Message = DH_sending.Key" enabled="true"/>
-<actions value="tmp2.Message = CK_receiving.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
-<actions value="tmp1 = hash(tmp4)" enabled="true"/>
-<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
-<actions value="RK.Key = CK_sending.Key" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="625" >
-<cdparam x="182" y="2577" />
-<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="624" />
-<P1  x="406" y="2253" id="845" />
-<P2  x="406" y="2324" id="744" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="623" >
-<father id="625" num="0" />
-<cdparam x="430" y="2276" />
-<sizeparam width="206" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="619" />
-<TGConnectingPoint num="1" id="620" />
-<TGConnectingPoint num="2" id="621" />
-<TGConnectingPoint num="3" id="622" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="tmp1.Message = CK_sending.Key" enabled="true"/>
-<actions value="tmp4 = hash(tmp1)" enabled="true"/>
-<actions value="CK_sending.Key = tmp4.Message" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="632" >
-<cdparam x="247" y="3273" />
-<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="631" />
-<P1  x="406" y="2354" id="749" />
-<P2  x="406" y="2406" id="703" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="630" >
-<father id="632" num="0" />
-<cdparam x="426" y="2378" />
-<sizeparam width="242" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="626" />
-<TGConnectingPoint num="1" id="627" />
-<TGConnectingPoint num="2" id="628" />
-<TGConnectingPoint num="3" id="629" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="a2_cipher = sencrypt(a2, CK_sending) " enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="639" >
-<cdparam x="167" y="3554" />
-<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="638" />
-<P1  x="406" y="2553" id="667" />
-<P2  x="406" y="2576" id="650" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="637" >
-<father id="639" num="0" />
-<cdparam x="173" y="3585" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="633" />
-<TGConnectingPoint num="1" id="634" />
-<TGConnectingPoint num="2" id="635" />
-<TGConnectingPoint num="3" id="636" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<CONNECTOR type="5102" id="646" >
-<cdparam x="180" y="3647" />
-<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="645" />
-<P1  x="406" y="2606" id="651" />
-<P2  x="405" y="2624" id="965" />
-<AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="644" >
-<father id="646" num="0" />
-<cdparam x="175" y="3672" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="640" />
-<TGConnectingPoint num="1" id="641" />
-<TGConnectingPoint num="2" id="642" />
-<TGConnectingPoint num="3" id="643" />
-<extraparam>
-<guard value="[ ]" enabled="true"/>
-<afterMin value="" enabled="true"/>
-<afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-</extraparam>
-</SUBCOMPONENT>
-
-<COMPONENT type="5108" id="649" >
-<cdparam x="325" y="142" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="647" />
-<TGConnectingPoint num="1" id="648" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="468" />
+<TGConnectingPoint num="1" id="469" />
 <extraparam>
 <Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="660" >
-<cdparam x="361" y="2581" />
+<COMPONENT type="5103" id="481" >
+<cdparam x="221" y="364" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(filler6)" />
-<TGConnectingPoint num="0" id="650" />
-<TGConnectingPoint num="1" id="651" />
-<TGConnectingPoint num="2" id="652" />
-<TGConnectingPoint num="3" id="653" />
-<TGConnectingPoint num="4" id="654" />
-<TGConnectingPoint num="5" id="655" />
-<TGConnectingPoint num="6" id="656" />
-<TGConnectingPoint num="7" id="657" />
-<TGConnectingPoint num="8" id="658" />
-<TGConnectingPoint num="9" id="659" />
+<infoparam name="Send signal" value="chout(filler2)" />
+<TGConnectingPoint num="0" id="471" />
+<TGConnectingPoint num="1" id="472" />
+<TGConnectingPoint num="2" id="473" />
+<TGConnectingPoint num="3" id="474" />
+<TGConnectingPoint num="4" id="475" />
+<TGConnectingPoint num="5" id="476" />
+<TGConnectingPoint num="6" id="477" />
+<TGConnectingPoint num="7" id="478" />
+<TGConnectingPoint num="8" id="479" />
+<TGConnectingPoint num="9" id="480" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="701" >
-<cdparam x="314" y="2523" />
-<sizeparam width="185" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="522" >
+<cdparam x="173" y="3242" />
+<sizeparam width="153" 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="4000" />
-<infoparam name="State" value="Sending_Message_a2" />
-<TGConnectingPoint num="0" id="661" />
-<TGConnectingPoint num="1" id="662" />
-<TGConnectingPoint num="2" id="663" />
-<TGConnectingPoint num="3" id="664" />
-<TGConnectingPoint num="4" id="665" />
-<TGConnectingPoint num="5" id="666" />
-<TGConnectingPoint num="6" id="667" />
-<TGConnectingPoint num="7" id="668" />
-<TGConnectingPoint num="8" id="669" />
-<TGConnectingPoint num="9" id="670" />
-<TGConnectingPoint num="10" id="671" />
-<TGConnectingPoint num="11" id="672" />
-<TGConnectingPoint num="12" id="673" />
-<TGConnectingPoint num="13" id="674" />
-<TGConnectingPoint num="14" id="675" />
-<TGConnectingPoint num="15" id="676" />
-<TGConnectingPoint num="16" id="677" />
-<TGConnectingPoint num="17" id="678" />
-<TGConnectingPoint num="18" id="679" />
-<TGConnectingPoint num="19" id="680" />
-<TGConnectingPoint num="20" id="681" />
-<TGConnectingPoint num="21" id="682" />
-<TGConnectingPoint num="22" id="683" />
-<TGConnectingPoint num="23" id="684" />
-<TGConnectingPoint num="24" id="685" />
-<TGConnectingPoint num="25" id="686" />
-<TGConnectingPoint num="26" id="687" />
-<TGConnectingPoint num="27" id="688" />
-<TGConnectingPoint num="28" id="689" />
-<TGConnectingPoint num="29" id="690" />
-<TGConnectingPoint num="30" id="691" />
-<TGConnectingPoint num="31" id="692" />
-<TGConnectingPoint num="32" id="693" />
-<TGConnectingPoint num="33" id="694" />
-<TGConnectingPoint num="34" id="695" />
-<TGConnectingPoint num="35" id="696" />
-<TGConnectingPoint num="36" id="697" />
-<TGConnectingPoint num="37" id="698" />
-<TGConnectingPoint num="38" id="699" />
-<TGConnectingPoint num="39" id="700" />
+<infoparam name="State" value="Decryption_2" />
+<TGConnectingPoint num="0" id="482" />
+<TGConnectingPoint num="1" id="483" />
+<TGConnectingPoint num="2" id="484" />
+<TGConnectingPoint num="3" id="485" />
+<TGConnectingPoint num="4" id="486" />
+<TGConnectingPoint num="5" id="487" />
+<TGConnectingPoint num="6" id="488" />
+<TGConnectingPoint num="7" id="489" />
+<TGConnectingPoint num="8" id="490" />
+<TGConnectingPoint num="9" id="491" />
+<TGConnectingPoint num="10" id="492" />
+<TGConnectingPoint num="11" id="493" />
+<TGConnectingPoint num="12" id="494" />
+<TGConnectingPoint num="13" id="495" />
+<TGConnectingPoint num="14" id="496" />
+<TGConnectingPoint num="15" id="497" />
+<TGConnectingPoint num="16" id="498" />
+<TGConnectingPoint num="17" id="499" />
+<TGConnectingPoint num="18" id="500" />
+<TGConnectingPoint num="19" id="501" />
+<TGConnectingPoint num="20" id="502" />
+<TGConnectingPoint num="21" id="503" />
+<TGConnectingPoint num="22" id="504" />
+<TGConnectingPoint num="23" id="505" />
+<TGConnectingPoint num="24" id="506" />
+<TGConnectingPoint num="25" id="507" />
+<TGConnectingPoint num="26" id="508" />
+<TGConnectingPoint num="27" id="509" />
+<TGConnectingPoint num="28" id="510" />
+<TGConnectingPoint num="29" id="511" />
+<TGConnectingPoint num="30" id="512" />
+<TGConnectingPoint num="31" id="513" />
+<TGConnectingPoint num="32" id="514" />
+<TGConnectingPoint num="33" id="515" />
+<TGConnectingPoint num="34" id="516" />
+<TGConnectingPoint num="35" id="517" />
+<TGConnectingPoint num="36" id="518" />
+<TGConnectingPoint num="37" id="519" />
+<TGConnectingPoint num="38" id="520" />
+<TGConnectingPoint num="39" id="521" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="742" >
-<cdparam x="356" y="2406" />
-<sizeparam width="100" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="563" >
+<cdparam x="79" y="3070" />
+<sizeparam width="374" 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="4000" />
-<infoparam name="State" value="Encryption_2" />
-<TGConnectingPoint num="0" id="702" />
-<TGConnectingPoint num="1" id="703" />
-<TGConnectingPoint num="2" id="704" />
-<TGConnectingPoint num="3" id="705" />
-<TGConnectingPoint num="4" id="706" />
-<TGConnectingPoint num="5" id="707" />
-<TGConnectingPoint num="6" id="708" />
-<TGConnectingPoint num="7" id="709" />
-<TGConnectingPoint num="8" id="710" />
-<TGConnectingPoint num="9" id="711" />
-<TGConnectingPoint num="10" id="712" />
-<TGConnectingPoint num="11" id="713" />
-<TGConnectingPoint num="12" id="714" />
-<TGConnectingPoint num="13" id="715" />
-<TGConnectingPoint num="14" id="716" />
-<TGConnectingPoint num="15" id="717" />
-<TGConnectingPoint num="16" id="718" />
-<TGConnectingPoint num="17" id="719" />
-<TGConnectingPoint num="18" id="720" />
-<TGConnectingPoint num="19" id="721" />
-<TGConnectingPoint num="20" id="722" />
-<TGConnectingPoint num="21" id="723" />
-<TGConnectingPoint num="22" id="724" />
-<TGConnectingPoint num="23" id="725" />
-<TGConnectingPoint num="24" id="726" />
-<TGConnectingPoint num="25" id="727" />
-<TGConnectingPoint num="26" id="728" />
-<TGConnectingPoint num="27" id="729" />
-<TGConnectingPoint num="28" id="730" />
-<TGConnectingPoint num="29" id="731" />
-<TGConnectingPoint num="30" id="732" />
-<TGConnectingPoint num="31" id="733" />
-<TGConnectingPoint num="32" id="734" />
-<TGConnectingPoint num="33" id="735" />
-<TGConnectingPoint num="34" id="736" />
-<TGConnectingPoint num="35" id="737" />
-<TGConnectingPoint num="36" id="738" />
-<TGConnectingPoint num="37" id="739" />
-<TGConnectingPoint num="38" id="740" />
-<TGConnectingPoint num="39" id="741" />
+<infoparam name="State" value="Receiving_Message_Key_2" />
+<TGConnectingPoint num="0" id="523" />
+<TGConnectingPoint num="1" id="524" />
+<TGConnectingPoint num="2" id="525" />
+<TGConnectingPoint num="3" id="526" />
+<TGConnectingPoint num="4" id="527" />
+<TGConnectingPoint num="5" id="528" />
+<TGConnectingPoint num="6" id="529" />
+<TGConnectingPoint num="7" id="530" />
+<TGConnectingPoint num="8" id="531" />
+<TGConnectingPoint num="9" id="532" />
+<TGConnectingPoint num="10" id="533" />
+<TGConnectingPoint num="11" id="534" />
+<TGConnectingPoint num="12" id="535" />
+<TGConnectingPoint num="13" id="536" />
+<TGConnectingPoint num="14" id="537" />
+<TGConnectingPoint num="15" id="538" />
+<TGConnectingPoint num="16" id="539" />
+<TGConnectingPoint num="17" id="540" />
+<TGConnectingPoint num="18" id="541" />
+<TGConnectingPoint num="19" id="542" />
+<TGConnectingPoint num="20" id="543" />
+<TGConnectingPoint num="21" id="544" />
+<TGConnectingPoint num="22" id="545" />
+<TGConnectingPoint num="23" id="546" />
+<TGConnectingPoint num="24" id="547" />
+<TGConnectingPoint num="25" id="548" />
+<TGConnectingPoint num="26" id="549" />
+<TGConnectingPoint num="27" id="550" />
+<TGConnectingPoint num="28" id="551" />
+<TGConnectingPoint num="29" id="552" />
+<TGConnectingPoint num="30" id="553" />
+<TGConnectingPoint num="31" id="554" />
+<TGConnectingPoint num="32" id="555" />
+<TGConnectingPoint num="33" id="556" />
+<TGConnectingPoint num="34" id="557" />
+<TGConnectingPoint num="35" id="558" />
+<TGConnectingPoint num="36" id="559" />
+<TGConnectingPoint num="37" id="560" />
+<TGConnectingPoint num="38" id="561" />
+<TGConnectingPoint num="39" id="562" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="783" >
-<cdparam x="296" y="2324" />
-<sizeparam width="220" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="604" >
+<cdparam x="72" y="2776" />
+<sizeparam width="294" 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="4000" />
-<infoparam name="State" value="Sending_Message_Key_2" />
-<TGConnectingPoint num="0" id="743" />
-<TGConnectingPoint num="1" id="744" />
-<TGConnectingPoint num="2" id="745" />
-<TGConnectingPoint num="3" id="746" />
-<TGConnectingPoint num="4" id="747" />
-<TGConnectingPoint num="5" id="748" />
-<TGConnectingPoint num="6" id="749" />
-<TGConnectingPoint num="7" id="750" />
-<TGConnectingPoint num="8" id="751" />
-<TGConnectingPoint num="9" id="752" />
-<TGConnectingPoint num="10" id="753" />
-<TGConnectingPoint num="11" id="754" />
-<TGConnectingPoint num="12" id="755" />
-<TGConnectingPoint num="13" id="756" />
-<TGConnectingPoint num="14" id="757" />
-<TGConnectingPoint num="15" id="758" />
-<TGConnectingPoint num="16" id="759" />
-<TGConnectingPoint num="17" id="760" />
-<TGConnectingPoint num="18" id="761" />
-<TGConnectingPoint num="19" id="762" />
-<TGConnectingPoint num="20" id="763" />
-<TGConnectingPoint num="21" id="764" />
-<TGConnectingPoint num="22" id="765" />
-<TGConnectingPoint num="23" id="766" />
-<TGConnectingPoint num="24" id="767" />
-<TGConnectingPoint num="25" id="768" />
-<TGConnectingPoint num="26" id="769" />
-<TGConnectingPoint num="27" id="770" />
-<TGConnectingPoint num="28" id="771" />
-<TGConnectingPoint num="29" id="772" />
-<TGConnectingPoint num="30" id="773" />
-<TGConnectingPoint num="31" id="774" />
-<TGConnectingPoint num="32" id="775" />
-<TGConnectingPoint num="33" id="776" />
-<TGConnectingPoint num="34" id="777" />
-<TGConnectingPoint num="35" id="778" />
-<TGConnectingPoint num="36" id="779" />
-<TGConnectingPoint num="37" id="780" />
-<TGConnectingPoint num="38" id="781" />
-<TGConnectingPoint num="39" id="782" />
+<infoparam name="State" value="KDF_RK_receiving_2" />
+<TGConnectingPoint num="0" id="564" />
+<TGConnectingPoint num="1" id="565" />
+<TGConnectingPoint num="2" id="566" />
+<TGConnectingPoint num="3" id="567" />
+<TGConnectingPoint num="4" id="568" />
+<TGConnectingPoint num="5" id="569" />
+<TGConnectingPoint num="6" id="570" />
+<TGConnectingPoint num="7" id="571" />
+<TGConnectingPoint num="8" id="572" />
+<TGConnectingPoint num="9" id="573" />
+<TGConnectingPoint num="10" id="574" />
+<TGConnectingPoint num="11" id="575" />
+<TGConnectingPoint num="12" id="576" />
+<TGConnectingPoint num="13" id="577" />
+<TGConnectingPoint num="14" id="578" />
+<TGConnectingPoint num="15" id="579" />
+<TGConnectingPoint num="16" id="580" />
+<TGConnectingPoint num="17" id="581" />
+<TGConnectingPoint num="18" id="582" />
+<TGConnectingPoint num="19" id="583" />
+<TGConnectingPoint num="20" id="584" />
+<TGConnectingPoint num="21" id="585" />
+<TGConnectingPoint num="22" id="586" />
+<TGConnectingPoint num="23" id="587" />
+<TGConnectingPoint num="24" id="588" />
+<TGConnectingPoint num="25" id="589" />
+<TGConnectingPoint num="26" id="590" />
+<TGConnectingPoint num="27" id="591" />
+<TGConnectingPoint num="28" id="592" />
+<TGConnectingPoint num="29" id="593" />
+<TGConnectingPoint num="30" id="594" />
+<TGConnectingPoint num="31" id="595" />
+<TGConnectingPoint num="32" id="596" />
+<TGConnectingPoint num="33" id="597" />
+<TGConnectingPoint num="34" id="598" />
+<TGConnectingPoint num="35" id="599" />
+<TGConnectingPoint num="36" id="600" />
+<TGConnectingPoint num="37" id="601" />
+<TGConnectingPoint num="38" id="602" />
+<TGConnectingPoint num="39" id="603" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="824" >
-<cdparam x="319" y="1865" />
-<sizeparam width="174" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="645" >
+<cdparam x="142" y="2581" />
+<sizeparam width="250" 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="4000" />
-<infoparam name="State" value="KDF_RK_receiving_2" />
-<TGConnectingPoint num="0" id="784" />
-<TGConnectingPoint num="1" id="785" />
-<TGConnectingPoint num="2" id="786" />
-<TGConnectingPoint num="3" id="787" />
-<TGConnectingPoint num="4" id="788" />
-<TGConnectingPoint num="5" id="789" />
-<TGConnectingPoint num="6" id="790" />
-<TGConnectingPoint num="7" id="791" />
-<TGConnectingPoint num="8" id="792" />
-<TGConnectingPoint num="9" id="793" />
-<TGConnectingPoint num="10" id="794" />
-<TGConnectingPoint num="11" id="795" />
-<TGConnectingPoint num="12" id="796" />
-<TGConnectingPoint num="13" id="797" />
-<TGConnectingPoint num="14" id="798" />
-<TGConnectingPoint num="15" id="799" />
-<TGConnectingPoint num="16" id="800" />
-<TGConnectingPoint num="17" id="801" />
-<TGConnectingPoint num="18" id="802" />
-<TGConnectingPoint num="19" id="803" />
-<TGConnectingPoint num="20" id="804" />
-<TGConnectingPoint num="21" id="805" />
-<TGConnectingPoint num="22" id="806" />
-<TGConnectingPoint num="23" id="807" />
-<TGConnectingPoint num="24" id="808" />
-<TGConnectingPoint num="25" id="809" />
-<TGConnectingPoint num="26" id="810" />
-<TGConnectingPoint num="27" id="811" />
-<TGConnectingPoint num="28" id="812" />
-<TGConnectingPoint num="29" id="813" />
-<TGConnectingPoint num="30" id="814" />
-<TGConnectingPoint num="31" id="815" />
-<TGConnectingPoint num="32" id="816" />
-<TGConnectingPoint num="33" id="817" />
-<TGConnectingPoint num="34" id="818" />
-<TGConnectingPoint num="35" id="819" />
-<TGConnectingPoint num="36" id="820" />
-<TGConnectingPoint num="37" id="821" />
-<TGConnectingPoint num="38" id="822" />
-<TGConnectingPoint num="39" id="823" />
+<infoparam name="State" value="DH_receiving_2" />
+<TGConnectingPoint num="0" id="605" />
+<TGConnectingPoint num="1" id="606" />
+<TGConnectingPoint num="2" id="607" />
+<TGConnectingPoint num="3" id="608" />
+<TGConnectingPoint num="4" id="609" />
+<TGConnectingPoint num="5" id="610" />
+<TGConnectingPoint num="6" id="611" />
+<TGConnectingPoint num="7" id="612" />
+<TGConnectingPoint num="8" id="613" />
+<TGConnectingPoint num="9" id="614" />
+<TGConnectingPoint num="10" id="615" />
+<TGConnectingPoint num="11" id="616" />
+<TGConnectingPoint num="12" id="617" />
+<TGConnectingPoint num="13" id="618" />
+<TGConnectingPoint num="14" id="619" />
+<TGConnectingPoint num="15" id="620" />
+<TGConnectingPoint num="16" id="621" />
+<TGConnectingPoint num="17" id="622" />
+<TGConnectingPoint num="18" id="623" />
+<TGConnectingPoint num="19" id="624" />
+<TGConnectingPoint num="20" id="625" />
+<TGConnectingPoint num="21" id="626" />
+<TGConnectingPoint num="22" id="627" />
+<TGConnectingPoint num="23" id="628" />
+<TGConnectingPoint num="24" id="629" />
+<TGConnectingPoint num="25" id="630" />
+<TGConnectingPoint num="26" id="631" />
+<TGConnectingPoint num="27" id="632" />
+<TGConnectingPoint num="28" id="633" />
+<TGConnectingPoint num="29" id="634" />
+<TGConnectingPoint num="30" id="635" />
+<TGConnectingPoint num="31" id="636" />
+<TGConnectingPoint num="32" id="637" />
+<TGConnectingPoint num="33" id="638" />
+<TGConnectingPoint num="34" id="639" />
+<TGConnectingPoint num="35" id="640" />
+<TGConnectingPoint num="36" id="641" />
+<TGConnectingPoint num="37" id="642" />
+<TGConnectingPoint num="38" id="643" />
+<TGConnectingPoint num="39" id="644" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="827" >
-<cdparam x="325" y="1992" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="686" >
+<cdparam x="200" y="2440" />
+<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="825" />
-<TGConnectingPoint num="1" id="826" />
+<infoparam name="State" value="Receiving_a2" />
+<TGConnectingPoint num="0" id="646" />
+<TGConnectingPoint num="1" id="647" />
+<TGConnectingPoint num="2" id="648" />
+<TGConnectingPoint num="3" id="649" />
+<TGConnectingPoint num="4" id="650" />
+<TGConnectingPoint num="5" id="651" />
+<TGConnectingPoint num="6" id="652" />
+<TGConnectingPoint num="7" id="653" />
+<TGConnectingPoint num="8" id="654" />
+<TGConnectingPoint num="9" id="655" />
+<TGConnectingPoint num="10" id="656" />
+<TGConnectingPoint num="11" id="657" />
+<TGConnectingPoint num="12" id="658" />
+<TGConnectingPoint num="13" id="659" />
+<TGConnectingPoint num="14" id="660" />
+<TGConnectingPoint num="15" id="661" />
+<TGConnectingPoint num="16" id="662" />
+<TGConnectingPoint num="17" id="663" />
+<TGConnectingPoint num="18" id="664" />
+<TGConnectingPoint num="19" id="665" />
+<TGConnectingPoint num="20" id="666" />
+<TGConnectingPoint num="21" id="667" />
+<TGConnectingPoint num="22" id="668" />
+<TGConnectingPoint num="23" id="669" />
+<TGConnectingPoint num="24" id="670" />
+<TGConnectingPoint num="25" id="671" />
+<TGConnectingPoint num="26" id="672" />
+<TGConnectingPoint num="27" id="673" />
+<TGConnectingPoint num="28" id="674" />
+<TGConnectingPoint num="29" id="675" />
+<TGConnectingPoint num="30" id="676" />
+<TGConnectingPoint num="31" id="677" />
+<TGConnectingPoint num="32" id="678" />
+<TGConnectingPoint num="33" id="679" />
+<TGConnectingPoint num="34" id="680" />
+<TGConnectingPoint num="35" id="681" />
+<TGConnectingPoint num="36" id="682" />
+<TGConnectingPoint num="37" id="683" />
+<TGConnectingPoint num="38" id="684" />
+<TGConnectingPoint num="39" id="685" />
 <extraparam>
-<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="838" >
-<cdparam x="362" y="1927" />
+<COMPONENT type="5104" id="697" >
+<cdparam x="152" y="2297" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Receive signal" value="chin(filler5)" />
-<TGConnectingPoint num="0" id="828" />
-<TGConnectingPoint num="1" id="829" />
-<TGConnectingPoint num="2" id="830" />
-<TGConnectingPoint num="3" id="831" />
-<TGConnectingPoint num="4" id="832" />
-<TGConnectingPoint num="5" id="833" />
-<TGConnectingPoint num="6" id="834" />
-<TGConnectingPoint num="7" id="835" />
-<TGConnectingPoint num="8" id="836" />
-<TGConnectingPoint num="9" id="837" />
+<infoparam name="Receive signal" value="chin(filler6)" />
+<TGConnectingPoint num="0" id="687" />
+<TGConnectingPoint num="1" id="688" />
+<TGConnectingPoint num="2" id="689" />
+<TGConnectingPoint num="3" id="690" />
+<TGConnectingPoint num="4" id="691" />
+<TGConnectingPoint num="5" id="692" />
+<TGConnectingPoint num="6" id="693" />
+<TGConnectingPoint num="7" id="694" />
+<TGConnectingPoint num="8" id="695" />
+<TGConnectingPoint num="9" id="696" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="879" >
-<cdparam x="320" y="2223" />
-<sizeparam width="172" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5108" id="700" >
+<cdparam x="207" y="2145" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="KDF_RK_sending_2" />
-<TGConnectingPoint num="0" id="839" />
-<TGConnectingPoint num="1" id="840" />
-<TGConnectingPoint num="2" id="841" />
-<TGConnectingPoint num="3" id="842" />
-<TGConnectingPoint num="4" id="843" />
-<TGConnectingPoint num="5" id="844" />
-<TGConnectingPoint num="6" id="845" />
-<TGConnectingPoint num="7" id="846" />
-<TGConnectingPoint num="8" id="847" />
-<TGConnectingPoint num="9" id="848" />
-<TGConnectingPoint num="10" id="849" />
-<TGConnectingPoint num="11" id="850" />
-<TGConnectingPoint num="12" id="851" />
-<TGConnectingPoint num="13" id="852" />
-<TGConnectingPoint num="14" id="853" />
-<TGConnectingPoint num="15" id="854" />
-<TGConnectingPoint num="16" id="855" />
-<TGConnectingPoint num="17" id="856" />
-<TGConnectingPoint num="18" id="857" />
-<TGConnectingPoint num="19" id="858" />
-<TGConnectingPoint num="20" id="859" />
-<TGConnectingPoint num="21" id="860" />
-<TGConnectingPoint num="22" id="861" />
-<TGConnectingPoint num="23" id="862" />
-<TGConnectingPoint num="24" id="863" />
-<TGConnectingPoint num="25" id="864" />
-<TGConnectingPoint num="26" id="865" />
-<TGConnectingPoint num="27" id="866" />
-<TGConnectingPoint num="28" id="867" />
-<TGConnectingPoint num="29" id="868" />
-<TGConnectingPoint num="30" id="869" />
-<TGConnectingPoint num="31" id="870" />
-<TGConnectingPoint num="32" id="871" />
-<TGConnectingPoint num="33" id="872" />
-<TGConnectingPoint num="34" id="873" />
-<TGConnectingPoint num="35" id="874" />
-<TGConnectingPoint num="36" id="875" />
-<TGConnectingPoint num="37" id="876" />
-<TGConnectingPoint num="38" id="877" />
-<TGConnectingPoint num="39" id="878" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="698" />
+<TGConnectingPoint num="1" id="699" />
 <extraparam>
+<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="920" >
-<cdparam x="337" y="2078" />
-<sizeparam width="138" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="711" >
+<cdparam x="201" y="2231" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="DH_sending_2" />
-<TGConnectingPoint num="0" id="880" />
-<TGConnectingPoint num="1" id="881" />
-<TGConnectingPoint num="2" id="882" />
-<TGConnectingPoint num="3" id="883" />
-<TGConnectingPoint num="4" id="884" />
-<TGConnectingPoint num="5" id="885" />
-<TGConnectingPoint num="6" id="886" />
-<TGConnectingPoint num="7" id="887" />
-<TGConnectingPoint num="8" id="888" />
-<TGConnectingPoint num="9" id="889" />
-<TGConnectingPoint num="10" id="890" />
-<TGConnectingPoint num="11" id="891" />
-<TGConnectingPoint num="12" id="892" />
-<TGConnectingPoint num="13" id="893" />
-<TGConnectingPoint num="14" id="894" />
-<TGConnectingPoint num="15" id="895" />
-<TGConnectingPoint num="16" id="896" />
-<TGConnectingPoint num="17" id="897" />
-<TGConnectingPoint num="18" id="898" />
-<TGConnectingPoint num="19" id="899" />
-<TGConnectingPoint num="20" id="900" />
-<TGConnectingPoint num="21" id="901" />
-<TGConnectingPoint num="22" id="902" />
-<TGConnectingPoint num="23" id="903" />
-<TGConnectingPoint num="24" id="904" />
-<TGConnectingPoint num="25" id="905" />
-<TGConnectingPoint num="26" id="906" />
-<TGConnectingPoint num="27" id="907" />
-<TGConnectingPoint num="28" id="908" />
-<TGConnectingPoint num="29" id="909" />
-<TGConnectingPoint num="30" id="910" />
-<TGConnectingPoint num="31" id="911" />
-<TGConnectingPoint num="32" id="912" />
-<TGConnectingPoint num="33" id="913" />
-<TGConnectingPoint num="34" id="914" />
-<TGConnectingPoint num="35" id="915" />
-<TGConnectingPoint num="36" id="916" />
-<TGConnectingPoint num="37" id="917" />
-<TGConnectingPoint num="38" id="918" />
-<TGConnectingPoint num="39" id="919" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(filler5)" />
+<TGConnectingPoint num="0" id="701" />
+<TGConnectingPoint num="1" id="702" />
+<TGConnectingPoint num="2" id="703" />
+<TGConnectingPoint num="3" id="704" />
+<TGConnectingPoint num="4" id="705" />
+<TGConnectingPoint num="5" id="706" />
+<TGConnectingPoint num="6" id="707" />
+<TGConnectingPoint num="7" id="708" />
+<TGConnectingPoint num="8" id="709" />
+<TGConnectingPoint num="9" id="710" />
 </COMPONENT>
 
-<COMPONENT type="5108" id="923" >
-<cdparam x="325" y="1633" />
+<COMPONENT type="5108" id="714" >
+<cdparam x="199" y="1864" />
 <sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="921" />
-<TGConnectingPoint num="1" id="922" />
+<TGConnectingPoint num="0" id="712" />
+<TGConnectingPoint num="1" id="713" />
 <extraparam>
 <Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="964" >
-<cdparam x="333" y="1725" />
-<sizeparam width="146" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="725" >
+<cdparam x="251" y="2092" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="DH_Receiving_2" />
-<TGConnectingPoint num="0" id="924" />
-<TGConnectingPoint num="1" id="925" />
-<TGConnectingPoint num="2" id="926" />
-<TGConnectingPoint num="3" id="927" />
-<TGConnectingPoint num="4" id="928" />
-<TGConnectingPoint num="5" id="929" />
-<TGConnectingPoint num="6" id="930" />
-<TGConnectingPoint num="7" id="931" />
-<TGConnectingPoint num="8" id="932" />
-<TGConnectingPoint num="9" id="933" />
-<TGConnectingPoint num="10" id="934" />
-<TGConnectingPoint num="11" id="935" />
-<TGConnectingPoint num="12" id="936" />
-<TGConnectingPoint num="13" id="937" />
-<TGConnectingPoint num="14" id="938" />
-<TGConnectingPoint num="15" id="939" />
-<TGConnectingPoint num="16" id="940" />
-<TGConnectingPoint num="17" id="941" />
-<TGConnectingPoint num="18" id="942" />
-<TGConnectingPoint num="19" id="943" />
-<TGConnectingPoint num="20" id="944" />
-<TGConnectingPoint num="21" id="945" />
-<TGConnectingPoint num="22" id="946" />
-<TGConnectingPoint num="23" id="947" />
-<TGConnectingPoint num="24" id="948" />
-<TGConnectingPoint num="25" id="949" />
-<TGConnectingPoint num="26" id="950" />
-<TGConnectingPoint num="27" id="951" />
-<TGConnectingPoint num="28" id="952" />
-<TGConnectingPoint num="29" id="953" />
-<TGConnectingPoint num="30" id="954" />
-<TGConnectingPoint num="31" id="955" />
-<TGConnectingPoint num="32" id="956" />
-<TGConnectingPoint num="33" id="957" />
-<TGConnectingPoint num="34" id="958" />
-<TGConnectingPoint num="35" id="959" />
-<TGConnectingPoint num="36" id="960" />
-<TGConnectingPoint num="37" id="961" />
-<TGConnectingPoint num="38" id="962" />
-<TGConnectingPoint num="39" id="963" />
-<extraparam>
-</extraparam>
-</COMPONENT>
-
-<COMPONENT type="5101" id="966" >
-<cdparam x="395" y="2629" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="965" />
+<infoparam name="Send signal" value="chout(filler4)" />
+<TGConnectingPoint num="0" id="715" />
+<TGConnectingPoint num="1" id="716" />
+<TGConnectingPoint num="2" id="717" />
+<TGConnectingPoint num="3" id="718" />
+<TGConnectingPoint num="4" id="719" />
+<TGConnectingPoint num="5" id="720" />
+<TGConnectingPoint num="6" id="721" />
+<TGConnectingPoint num="7" id="722" />
+<TGConnectingPoint num="8" id="723" />
+<TGConnectingPoint num="9" id="724" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1007" >
-<cdparam x="353" y="1570" />
-<sizeparam width="106" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="766" >
+<cdparam x="169" y="2011" />
+<sizeparam width="242" 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="4000" />
-<infoparam name="State" value="Decryption" />
-<TGConnectingPoint num="0" id="967" />
-<TGConnectingPoint num="1" id="968" />
-<TGConnectingPoint num="2" id="969" />
-<TGConnectingPoint num="3" id="970" />
-<TGConnectingPoint num="4" id="971" />
-<TGConnectingPoint num="5" id="972" />
-<TGConnectingPoint num="6" id="973" />
-<TGConnectingPoint num="7" id="974" />
-<TGConnectingPoint num="8" id="975" />
-<TGConnectingPoint num="9" id="976" />
-<TGConnectingPoint num="10" id="977" />
-<TGConnectingPoint num="11" id="978" />
-<TGConnectingPoint num="12" id="979" />
-<TGConnectingPoint num="13" id="980" />
-<TGConnectingPoint num="14" id="981" />
-<TGConnectingPoint num="15" id="982" />
-<TGConnectingPoint num="16" id="983" />
-<TGConnectingPoint num="17" id="984" />
-<TGConnectingPoint num="18" id="985" />
-<TGConnectingPoint num="19" id="986" />
-<TGConnectingPoint num="20" id="987" />
-<TGConnectingPoint num="21" id="988" />
-<TGConnectingPoint num="22" id="989" />
-<TGConnectingPoint num="23" id="990" />
-<TGConnectingPoint num="24" id="991" />
-<TGConnectingPoint num="25" id="992" />
-<TGConnectingPoint num="26" id="993" />
-<TGConnectingPoint num="27" id="994" />
-<TGConnectingPoint num="28" id="995" />
-<TGConnectingPoint num="29" id="996" />
-<TGConnectingPoint num="30" id="997" />
-<TGConnectingPoint num="31" id="998" />
-<TGConnectingPoint num="32" id="999" />
-<TGConnectingPoint num="33" id="1000" />
-<TGConnectingPoint num="34" id="1001" />
-<TGConnectingPoint num="35" id="1002" />
-<TGConnectingPoint num="36" id="1003" />
-<TGConnectingPoint num="37" id="1004" />
-<TGConnectingPoint num="38" id="1005" />
-<TGConnectingPoint num="39" id="1006" />
+<infoparam name="State" value="Sending_message" />
+<TGConnectingPoint num="0" id="726" />
+<TGConnectingPoint num="1" id="727" />
+<TGConnectingPoint num="2" id="728" />
+<TGConnectingPoint num="3" id="729" />
+<TGConnectingPoint num="4" id="730" />
+<TGConnectingPoint num="5" id="731" />
+<TGConnectingPoint num="6" id="732" />
+<TGConnectingPoint num="7" id="733" />
+<TGConnectingPoint num="8" id="734" />
+<TGConnectingPoint num="9" id="735" />
+<TGConnectingPoint num="10" id="736" />
+<TGConnectingPoint num="11" id="737" />
+<TGConnectingPoint num="12" id="738" />
+<TGConnectingPoint num="13" id="739" />
+<TGConnectingPoint num="14" id="740" />
+<TGConnectingPoint num="15" id="741" />
+<TGConnectingPoint num="16" id="742" />
+<TGConnectingPoint num="17" id="743" />
+<TGConnectingPoint num="18" id="744" />
+<TGConnectingPoint num="19" id="745" />
+<TGConnectingPoint num="20" id="746" />
+<TGConnectingPoint num="21" id="747" />
+<TGConnectingPoint num="22" id="748" />
+<TGConnectingPoint num="23" id="749" />
+<TGConnectingPoint num="24" id="750" />
+<TGConnectingPoint num="25" id="751" />
+<TGConnectingPoint num="26" id="752" />
+<TGConnectingPoint num="27" id="753" />
+<TGConnectingPoint num="28" id="754" />
+<TGConnectingPoint num="29" id="755" />
+<TGConnectingPoint num="30" id="756" />
+<TGConnectingPoint num="31" id="757" />
+<TGConnectingPoint num="32" id="758" />
+<TGConnectingPoint num="33" id="759" />
+<TGConnectingPoint num="34" id="760" />
+<TGConnectingPoint num="35" id="761" />
+<TGConnectingPoint num="36" id="762" />
+<TGConnectingPoint num="37" id="763" />
+<TGConnectingPoint num="38" id="764" />
+<TGConnectingPoint num="39" id="765" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1048" >
-<cdparam x="313" y="1482" />
-<sizeparam width="187" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="807" >
+<cdparam x="159" y="1786" />
+<sizeparam width="234" 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="4000" />
-<infoparam name="State" value="Receiving_message_b" />
-<TGConnectingPoint num="0" id="1008" />
-<TGConnectingPoint num="1" id="1009" />
-<TGConnectingPoint num="2" id="1010" />
-<TGConnectingPoint num="3" id="1011" />
-<TGConnectingPoint num="4" id="1012" />
-<TGConnectingPoint num="5" id="1013" />
-<TGConnectingPoint num="6" id="1014" />
-<TGConnectingPoint num="7" id="1015" />
-<TGConnectingPoint num="8" id="1016" />
-<TGConnectingPoint num="9" id="1017" />
-<TGConnectingPoint num="10" id="1018" />
-<TGConnectingPoint num="11" id="1019" />
-<TGConnectingPoint num="12" id="1020" />
-<TGConnectingPoint num="13" id="1021" />
-<TGConnectingPoint num="14" id="1022" />
-<TGConnectingPoint num="15" id="1023" />
-<TGConnectingPoint num="16" id="1024" />
-<TGConnectingPoint num="17" id="1025" />
-<TGConnectingPoint num="18" id="1026" />
-<TGConnectingPoint num="19" id="1027" />
-<TGConnectingPoint num="20" id="1028" />
-<TGConnectingPoint num="21" id="1029" />
-<TGConnectingPoint num="22" id="1030" />
-<TGConnectingPoint num="23" id="1031" />
-<TGConnectingPoint num="24" id="1032" />
-<TGConnectingPoint num="25" id="1033" />
-<TGConnectingPoint num="26" id="1034" />
-<TGConnectingPoint num="27" id="1035" />
-<TGConnectingPoint num="28" id="1036" />
-<TGConnectingPoint num="29" id="1037" />
-<TGConnectingPoint num="30" id="1038" />
-<TGConnectingPoint num="31" id="1039" />
-<TGConnectingPoint num="32" id="1040" />
-<TGConnectingPoint num="33" id="1041" />
-<TGConnectingPoint num="34" id="1042" />
-<TGConnectingPoint num="35" id="1043" />
-<TGConnectingPoint num="36" id="1044" />
-<TGConnectingPoint num="37" id="1045" />
-<TGConnectingPoint num="38" id="1046" />
-<TGConnectingPoint num="39" id="1047" />
+<infoparam name="State" value="Encryption" />
+<TGConnectingPoint num="0" id="767" />
+<TGConnectingPoint num="1" id="768" />
+<TGConnectingPoint num="2" id="769" />
+<TGConnectingPoint num="3" id="770" />
+<TGConnectingPoint num="4" id="771" />
+<TGConnectingPoint num="5" id="772" />
+<TGConnectingPoint num="6" id="773" />
+<TGConnectingPoint num="7" id="774" />
+<TGConnectingPoint num="8" id="775" />
+<TGConnectingPoint num="9" id="776" />
+<TGConnectingPoint num="10" id="777" />
+<TGConnectingPoint num="11" id="778" />
+<TGConnectingPoint num="12" id="779" />
+<TGConnectingPoint num="13" id="780" />
+<TGConnectingPoint num="14" id="781" />
+<TGConnectingPoint num="15" id="782" />
+<TGConnectingPoint num="16" id="783" />
+<TGConnectingPoint num="17" id="784" />
+<TGConnectingPoint num="18" id="785" />
+<TGConnectingPoint num="19" id="786" />
+<TGConnectingPoint num="20" id="787" />
+<TGConnectingPoint num="21" id="788" />
+<TGConnectingPoint num="22" id="789" />
+<TGConnectingPoint num="23" id="790" />
+<TGConnectingPoint num="24" id="791" />
+<TGConnectingPoint num="25" id="792" />
+<TGConnectingPoint num="26" id="793" />
+<TGConnectingPoint num="27" id="794" />
+<TGConnectingPoint num="28" id="795" />
+<TGConnectingPoint num="29" id="796" />
+<TGConnectingPoint num="30" id="797" />
+<TGConnectingPoint num="31" id="798" />
+<TGConnectingPoint num="32" id="799" />
+<TGConnectingPoint num="33" id="800" />
+<TGConnectingPoint num="34" id="801" />
+<TGConnectingPoint num="35" id="802" />
+<TGConnectingPoint num="36" id="803" />
+<TGConnectingPoint num="37" id="804" />
+<TGConnectingPoint num="38" id="805" />
+<TGConnectingPoint num="39" id="806" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1059" >
-<cdparam x="362" y="1401" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Receive signal" value="chin(filler4)" />
-<TGConnectingPoint num="0" id="1049" />
-<TGConnectingPoint num="1" id="1050" />
-<TGConnectingPoint num="2" id="1051" />
-<TGConnectingPoint num="3" id="1052" />
-<TGConnectingPoint num="4" id="1053" />
-<TGConnectingPoint num="5" id="1054" />
-<TGConnectingPoint num="6" id="1055" />
-<TGConnectingPoint num="7" id="1056" />
-<TGConnectingPoint num="8" id="1057" />
-<TGConnectingPoint num="9" id="1058" />
-</COMPONENT>
-
-<COMPONENT type="5103" id="1070" >
-<cdparam x="361" y="1348" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(filler3)" />
-<TGConnectingPoint num="0" id="1060" />
-<TGConnectingPoint num="1" id="1061" />
-<TGConnectingPoint num="2" id="1062" />
-<TGConnectingPoint num="3" id="1063" />
-<TGConnectingPoint num="4" id="1064" />
-<TGConnectingPoint num="5" id="1065" />
-<TGConnectingPoint num="6" id="1066" />
-<TGConnectingPoint num="7" id="1067" />
-<TGConnectingPoint num="8" id="1068" />
-<TGConnectingPoint num="9" id="1069" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1111" >
-<cdparam x="316" y="1283" />
-<sizeparam width="180" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="848" >
+<cdparam x="104" y="1666" />
+<sizeparam width="241" 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="4000" />
-<infoparam name="State" value="Sending_message_a" />
-<TGConnectingPoint num="0" id="1071" />
-<TGConnectingPoint num="1" id="1072" />
-<TGConnectingPoint num="2" id="1073" />
-<TGConnectingPoint num="3" id="1074" />
-<TGConnectingPoint num="4" id="1075" />
-<TGConnectingPoint num="5" id="1076" />
-<TGConnectingPoint num="6" id="1077" />
-<TGConnectingPoint num="7" id="1078" />
-<TGConnectingPoint num="8" id="1079" />
-<TGConnectingPoint num="9" id="1080" />
-<TGConnectingPoint num="10" id="1081" />
-<TGConnectingPoint num="11" id="1082" />
-<TGConnectingPoint num="12" id="1083" />
-<TGConnectingPoint num="13" id="1084" />
-<TGConnectingPoint num="14" id="1085" />
-<TGConnectingPoint num="15" id="1086" />
-<TGConnectingPoint num="16" id="1087" />
-<TGConnectingPoint num="17" id="1088" />
-<TGConnectingPoint num="18" id="1089" />
-<TGConnectingPoint num="19" id="1090" />
-<TGConnectingPoint num="20" id="1091" />
-<TGConnectingPoint num="21" id="1092" />
-<TGConnectingPoint num="22" id="1093" />
-<TGConnectingPoint num="23" id="1094" />
-<TGConnectingPoint num="24" id="1095" />
-<TGConnectingPoint num="25" id="1096" />
-<TGConnectingPoint num="26" id="1097" />
-<TGConnectingPoint num="27" id="1098" />
-<TGConnectingPoint num="28" id="1099" />
-<TGConnectingPoint num="29" id="1100" />
-<TGConnectingPoint num="30" id="1101" />
-<TGConnectingPoint num="31" id="1102" />
-<TGConnectingPoint num="32" id="1103" />
-<TGConnectingPoint num="33" id="1104" />
-<TGConnectingPoint num="34" id="1105" />
-<TGConnectingPoint num="35" id="1106" />
-<TGConnectingPoint num="36" id="1107" />
-<TGConnectingPoint num="37" id="1108" />
-<TGConnectingPoint num="38" id="1109" />
-<TGConnectingPoint num="39" id="1110" />
+<infoparam name="State" value="Decryption" />
+<TGConnectingPoint num="0" id="808" />
+<TGConnectingPoint num="1" id="809" />
+<TGConnectingPoint num="2" id="810" />
+<TGConnectingPoint num="3" id="811" />
+<TGConnectingPoint num="4" id="812" />
+<TGConnectingPoint num="5" id="813" />
+<TGConnectingPoint num="6" id="814" />
+<TGConnectingPoint num="7" id="815" />
+<TGConnectingPoint num="8" id="816" />
+<TGConnectingPoint num="9" id="817" />
+<TGConnectingPoint num="10" id="818" />
+<TGConnectingPoint num="11" id="819" />
+<TGConnectingPoint num="12" id="820" />
+<TGConnectingPoint num="13" id="821" />
+<TGConnectingPoint num="14" id="822" />
+<TGConnectingPoint num="15" id="823" />
+<TGConnectingPoint num="16" id="824" />
+<TGConnectingPoint num="17" id="825" />
+<TGConnectingPoint num="18" id="826" />
+<TGConnectingPoint num="19" id="827" />
+<TGConnectingPoint num="20" id="828" />
+<TGConnectingPoint num="21" id="829" />
+<TGConnectingPoint num="22" id="830" />
+<TGConnectingPoint num="23" id="831" />
+<TGConnectingPoint num="24" id="832" />
+<TGConnectingPoint num="25" id="833" />
+<TGConnectingPoint num="26" id="834" />
+<TGConnectingPoint num="27" id="835" />
+<TGConnectingPoint num="28" id="836" />
+<TGConnectingPoint num="29" id="837" />
+<TGConnectingPoint num="30" id="838" />
+<TGConnectingPoint num="31" id="839" />
+<TGConnectingPoint num="32" id="840" />
+<TGConnectingPoint num="33" id="841" />
+<TGConnectingPoint num="34" id="842" />
+<TGConnectingPoint num="35" id="843" />
+<TGConnectingPoint num="36" id="844" />
+<TGConnectingPoint num="37" id="845" />
+<TGConnectingPoint num="38" id="846" />
+<TGConnectingPoint num="39" id="847" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1152" >
-<cdparam x="352" y="1154" />
-<sizeparam width="108" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="889" >
+<cdparam x="53" y="1541" />
+<sizeparam width="388" 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="4000" />
-<infoparam name="State" value="Encryption" />
-<TGConnectingPoint num="0" id="1112" />
-<TGConnectingPoint num="1" id="1113" />
-<TGConnectingPoint num="2" id="1114" />
-<TGConnectingPoint num="3" id="1115" />
-<TGConnectingPoint num="4" id="1116" />
-<TGConnectingPoint num="5" id="1117" />
-<TGConnectingPoint num="6" id="1118" />
-<TGConnectingPoint num="7" id="1119" />
-<TGConnectingPoint num="8" id="1120" />
-<TGConnectingPoint num="9" id="1121" />
-<TGConnectingPoint num="10" id="1122" />
-<TGConnectingPoint num="11" id="1123" />
-<TGConnectingPoint num="12" id="1124" />
-<TGConnectingPoint num="13" id="1125" />
-<TGConnectingPoint num="14" id="1126" />
-<TGConnectingPoint num="15" id="1127" />
-<TGConnectingPoint num="16" id="1128" />
-<TGConnectingPoint num="17" id="1129" />
-<TGConnectingPoint num="18" id="1130" />
-<TGConnectingPoint num="19" id="1131" />
-<TGConnectingPoint num="20" id="1132" />
-<TGConnectingPoint num="21" id="1133" />
-<TGConnectingPoint num="22" id="1134" />
-<TGConnectingPoint num="23" id="1135" />
-<TGConnectingPoint num="24" id="1136" />
-<TGConnectingPoint num="25" id="1137" />
-<TGConnectingPoint num="26" id="1138" />
-<TGConnectingPoint num="27" id="1139" />
-<TGConnectingPoint num="28" id="1140" />
-<TGConnectingPoint num="29" id="1141" />
-<TGConnectingPoint num="30" id="1142" />
-<TGConnectingPoint num="31" id="1143" />
-<TGConnectingPoint num="32" id="1144" />
-<TGConnectingPoint num="33" id="1145" />
-<TGConnectingPoint num="34" id="1146" />
-<TGConnectingPoint num="35" id="1147" />
-<TGConnectingPoint num="36" id="1148" />
-<TGConnectingPoint num="37" id="1149" />
-<TGConnectingPoint num="38" id="1150" />
-<TGConnectingPoint num="39" id="1151" />
+<infoparam name="State" value="Message_Key_sending" />
+<TGConnectingPoint num="0" id="849" />
+<TGConnectingPoint num="1" id="850" />
+<TGConnectingPoint num="2" id="851" />
+<TGConnectingPoint num="3" id="852" />
+<TGConnectingPoint num="4" id="853" />
+<TGConnectingPoint num="5" id="854" />
+<TGConnectingPoint num="6" id="855" />
+<TGConnectingPoint num="7" id="856" />
+<TGConnectingPoint num="8" id="857" />
+<TGConnectingPoint num="9" id="858" />
+<TGConnectingPoint num="10" id="859" />
+<TGConnectingPoint num="11" id="860" />
+<TGConnectingPoint num="12" id="861" />
+<TGConnectingPoint num="13" id="862" />
+<TGConnectingPoint num="14" id="863" />
+<TGConnectingPoint num="15" id="864" />
+<TGConnectingPoint num="16" id="865" />
+<TGConnectingPoint num="17" id="866" />
+<TGConnectingPoint num="18" id="867" />
+<TGConnectingPoint num="19" id="868" />
+<TGConnectingPoint num="20" id="869" />
+<TGConnectingPoint num="21" id="870" />
+<TGConnectingPoint num="22" id="871" />
+<TGConnectingPoint num="23" id="872" />
+<TGConnectingPoint num="24" id="873" />
+<TGConnectingPoint num="25" id="874" />
+<TGConnectingPoint num="26" id="875" />
+<TGConnectingPoint num="27" id="876" />
+<TGConnectingPoint num="28" id="877" />
+<TGConnectingPoint num="29" id="878" />
+<TGConnectingPoint num="30" id="879" />
+<TGConnectingPoint num="31" id="880" />
+<TGConnectingPoint num="32" id="881" />
+<TGConnectingPoint num="33" id="882" />
+<TGConnectingPoint num="34" id="883" />
+<TGConnectingPoint num="35" id="884" />
+<TGConnectingPoint num="36" id="885" />
+<TGConnectingPoint num="37" id="886" />
+<TGConnectingPoint num="38" id="887" />
+<TGConnectingPoint num="39" id="888" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="1155" >
-<cdparam x="325" y="602" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="930" >
+<cdparam x="153" y="1375" />
+<sizeparam width="225" 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="4000" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1153" />
-<TGConnectingPoint num="1" id="1154" />
+<infoparam name="State" value="Message_Key_receiving" />
+<TGConnectingPoint num="0" id="890" />
+<TGConnectingPoint num="1" id="891" />
+<TGConnectingPoint num="2" id="892" />
+<TGConnectingPoint num="3" id="893" />
+<TGConnectingPoint num="4" id="894" />
+<TGConnectingPoint num="5" id="895" />
+<TGConnectingPoint num="6" id="896" />
+<TGConnectingPoint num="7" id="897" />
+<TGConnectingPoint num="8" id="898" />
+<TGConnectingPoint num="9" id="899" />
+<TGConnectingPoint num="10" id="900" />
+<TGConnectingPoint num="11" id="901" />
+<TGConnectingPoint num="12" id="902" />
+<TGConnectingPoint num="13" id="903" />
+<TGConnectingPoint num="14" id="904" />
+<TGConnectingPoint num="15" id="905" />
+<TGConnectingPoint num="16" id="906" />
+<TGConnectingPoint num="17" id="907" />
+<TGConnectingPoint num="18" id="908" />
+<TGConnectingPoint num="19" id="909" />
+<TGConnectingPoint num="20" id="910" />
+<TGConnectingPoint num="21" id="911" />
+<TGConnectingPoint num="22" id="912" />
+<TGConnectingPoint num="23" id="913" />
+<TGConnectingPoint num="24" id="914" />
+<TGConnectingPoint num="25" id="915" />
+<TGConnectingPoint num="26" id="916" />
+<TGConnectingPoint num="27" id="917" />
+<TGConnectingPoint num="28" id="918" />
+<TGConnectingPoint num="29" id="919" />
+<TGConnectingPoint num="30" id="920" />
+<TGConnectingPoint num="31" id="921" />
+<TGConnectingPoint num="32" id="922" />
+<TGConnectingPoint num="33" id="923" />
+<TGConnectingPoint num="34" id="924" />
+<TGConnectingPoint num="35" id="925" />
+<TGConnectingPoint num="36" id="926" />
+<TGConnectingPoint num="37" id="927" />
+<TGConnectingPoint num="38" id="928" />
+<TGConnectingPoint num="39" id="929" />
 <extraparam>
-<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1166" >
-<cdparam x="362" y="534" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Receive signal" value="chin(filler2)" />
-<TGConnectingPoint num="0" id="1156" />
-<TGConnectingPoint num="1" id="1157" />
-<TGConnectingPoint num="2" id="1158" />
-<TGConnectingPoint num="3" id="1159" />
-<TGConnectingPoint num="4" id="1160" />
-<TGConnectingPoint num="5" id="1161" />
-<TGConnectingPoint num="6" id="1162" />
-<TGConnectingPoint num="7" id="1163" />
-<TGConnectingPoint num="8" id="1164" />
-<TGConnectingPoint num="9" id="1165" />
-</COMPONENT>
-
-<COMPONENT type="5106" id="1207" >
-<cdparam x="279" y="1064" />
-<sizeparam width="254" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="971" >
+<cdparam x="148" y="1231" />
+<sizeparam width="249" 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="4000" />
-<infoparam name="State" value="calculate_sending_message_Key" />
-<TGConnectingPoint num="0" id="1167" />
-<TGConnectingPoint num="1" id="1168" />
-<TGConnectingPoint num="2" id="1169" />
-<TGConnectingPoint num="3" id="1170" />
-<TGConnectingPoint num="4" id="1171" />
-<TGConnectingPoint num="5" id="1172" />
-<TGConnectingPoint num="6" id="1173" />
-<TGConnectingPoint num="7" id="1174" />
-<TGConnectingPoint num="8" id="1175" />
-<TGConnectingPoint num="9" id="1176" />
-<TGConnectingPoint num="10" id="1177" />
-<TGConnectingPoint num="11" id="1178" />
-<TGConnectingPoint num="12" id="1179" />
-<TGConnectingPoint num="13" id="1180" />
-<TGConnectingPoint num="14" id="1181" />
-<TGConnectingPoint num="15" id="1182" />
-<TGConnectingPoint num="16" id="1183" />
-<TGConnectingPoint num="17" id="1184" />
-<TGConnectingPoint num="18" id="1185" />
-<TGConnectingPoint num="19" id="1186" />
-<TGConnectingPoint num="20" id="1187" />
-<TGConnectingPoint num="21" id="1188" />
-<TGConnectingPoint num="22" id="1189" />
-<TGConnectingPoint num="23" id="1190" />
-<TGConnectingPoint num="24" id="1191" />
-<TGConnectingPoint num="25" id="1192" />
-<TGConnectingPoint num="26" id="1193" />
-<TGConnectingPoint num="27" id="1194" />
-<TGConnectingPoint num="28" id="1195" />
-<TGConnectingPoint num="29" id="1196" />
-<TGConnectingPoint num="30" id="1197" />
-<TGConnectingPoint num="31" id="1198" />
-<TGConnectingPoint num="32" id="1199" />
-<TGConnectingPoint num="33" id="1200" />
-<TGConnectingPoint num="34" id="1201" />
-<TGConnectingPoint num="35" id="1202" />
-<TGConnectingPoint num="36" id="1203" />
-<TGConnectingPoint num="37" id="1204" />
-<TGConnectingPoint num="38" id="1205" />
-<TGConnectingPoint num="39" id="1206" />
+<infoparam name="State" value="KDF_receiving" />
+<TGConnectingPoint num="0" id="931" />
+<TGConnectingPoint num="1" id="932" />
+<TGConnectingPoint num="2" id="933" />
+<TGConnectingPoint num="3" id="934" />
+<TGConnectingPoint num="4" id="935" />
+<TGConnectingPoint num="5" id="936" />
+<TGConnectingPoint num="6" id="937" />
+<TGConnectingPoint num="7" id="938" />
+<TGConnectingPoint num="8" id="939" />
+<TGConnectingPoint num="9" id="940" />
+<TGConnectingPoint num="10" id="941" />
+<TGConnectingPoint num="11" id="942" />
+<TGConnectingPoint num="12" id="943" />
+<TGConnectingPoint num="13" id="944" />
+<TGConnectingPoint num="14" id="945" />
+<TGConnectingPoint num="15" id="946" />
+<TGConnectingPoint num="16" id="947" />
+<TGConnectingPoint num="17" id="948" />
+<TGConnectingPoint num="18" id="949" />
+<TGConnectingPoint num="19" id="950" />
+<TGConnectingPoint num="20" id="951" />
+<TGConnectingPoint num="21" id="952" />
+<TGConnectingPoint num="22" id="953" />
+<TGConnectingPoint num="23" id="954" />
+<TGConnectingPoint num="24" id="955" />
+<TGConnectingPoint num="25" id="956" />
+<TGConnectingPoint num="26" id="957" />
+<TGConnectingPoint num="27" id="958" />
+<TGConnectingPoint num="28" id="959" />
+<TGConnectingPoint num="29" id="960" />
+<TGConnectingPoint num="30" id="961" />
+<TGConnectingPoint num="31" id="962" />
+<TGConnectingPoint num="32" id="963" />
+<TGConnectingPoint num="33" id="964" />
+<TGConnectingPoint num="34" id="965" />
+<TGConnectingPoint num="35" id="966" />
+<TGConnectingPoint num="36" id="967" />
+<TGConnectingPoint num="37" id="968" />
+<TGConnectingPoint num="38" id="969" />
+<TGConnectingPoint num="39" id="970" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1248" >
-<cdparam x="266" y="931" />
-<sizeparam width="281" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1012" >
+<cdparam x="183" y="1051" />
+<sizeparam width="293" 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="4000" />
-<infoparam name="State" value="calculate_receiving_message_Key" />
-<TGConnectingPoint num="0" id="1208" />
-<TGConnectingPoint num="1" id="1209" />
-<TGConnectingPoint num="2" id="1210" />
-<TGConnectingPoint num="3" id="1211" />
-<TGConnectingPoint num="4" id="1212" />
-<TGConnectingPoint num="5" id="1213" />
-<TGConnectingPoint num="6" id="1214" />
-<TGConnectingPoint num="7" id="1215" />
-<TGConnectingPoint num="8" id="1216" />
-<TGConnectingPoint num="9" id="1217" />
-<TGConnectingPoint num="10" id="1218" />
-<TGConnectingPoint num="11" id="1219" />
-<TGConnectingPoint num="12" id="1220" />
-<TGConnectingPoint num="13" id="1221" />
-<TGConnectingPoint num="14" id="1222" />
-<TGConnectingPoint num="15" id="1223" />
-<TGConnectingPoint num="16" id="1224" />
-<TGConnectingPoint num="17" id="1225" />
-<TGConnectingPoint num="18" id="1226" />
-<TGConnectingPoint num="19" id="1227" />
-<TGConnectingPoint num="20" id="1228" />
-<TGConnectingPoint num="21" id="1229" />
-<TGConnectingPoint num="22" id="1230" />
-<TGConnectingPoint num="23" id="1231" />
-<TGConnectingPoint num="24" id="1232" />
-<TGConnectingPoint num="25" id="1233" />
-<TGConnectingPoint num="26" id="1234" />
-<TGConnectingPoint num="27" id="1235" />
-<TGConnectingPoint num="28" id="1236" />
-<TGConnectingPoint num="29" id="1237" />
-<TGConnectingPoint num="30" id="1238" />
-<TGConnectingPoint num="31" id="1239" />
-<TGConnectingPoint num="32" id="1240" />
-<TGConnectingPoint num="33" id="1241" />
-<TGConnectingPoint num="34" id="1242" />
-<TGConnectingPoint num="35" id="1243" />
-<TGConnectingPoint num="36" id="1244" />
-<TGConnectingPoint num="37" id="1245" />
-<TGConnectingPoint num="38" id="1246" />
-<TGConnectingPoint num="39" id="1247" />
+<infoparam name="State" value="DH_receiving" />
+<TGConnectingPoint num="0" id="972" />
+<TGConnectingPoint num="1" id="973" />
+<TGConnectingPoint num="2" id="974" />
+<TGConnectingPoint num="3" id="975" />
+<TGConnectingPoint num="4" id="976" />
+<TGConnectingPoint num="5" id="977" />
+<TGConnectingPoint num="6" id="978" />
+<TGConnectingPoint num="7" id="979" />
+<TGConnectingPoint num="8" id="980" />
+<TGConnectingPoint num="9" id="981" />
+<TGConnectingPoint num="10" id="982" />
+<TGConnectingPoint num="11" id="983" />
+<TGConnectingPoint num="12" id="984" />
+<TGConnectingPoint num="13" id="985" />
+<TGConnectingPoint num="14" id="986" />
+<TGConnectingPoint num="15" id="987" />
+<TGConnectingPoint num="16" id="988" />
+<TGConnectingPoint num="17" id="989" />
+<TGConnectingPoint num="18" id="990" />
+<TGConnectingPoint num="19" id="991" />
+<TGConnectingPoint num="20" id="992" />
+<TGConnectingPoint num="21" id="993" />
+<TGConnectingPoint num="22" id="994" />
+<TGConnectingPoint num="23" id="995" />
+<TGConnectingPoint num="24" id="996" />
+<TGConnectingPoint num="25" id="997" />
+<TGConnectingPoint num="26" id="998" />
+<TGConnectingPoint num="27" id="999" />
+<TGConnectingPoint num="28" id="1000" />
+<TGConnectingPoint num="29" id="1001" />
+<TGConnectingPoint num="30" id="1002" />
+<TGConnectingPoint num="31" id="1003" />
+<TGConnectingPoint num="32" id="1004" />
+<TGConnectingPoint num="33" id="1005" />
+<TGConnectingPoint num="34" id="1006" />
+<TGConnectingPoint num="35" id="1007" />
+<TGConnectingPoint num="36" id="1008" />
+<TGConnectingPoint num="37" id="1009" />
+<TGConnectingPoint num="38" id="1010" />
+<TGConnectingPoint num="39" id="1011" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1289" >
-<cdparam x="329" y="821" />
-<sizeparam width="154" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1053" >
+<cdparam x="207" y="809" />
+<sizeparam width="287" 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="4000" />
 <infoparam name="State" value="KDF_RK_sending" />
-<TGConnectingPoint num="0" id="1249" />
-<TGConnectingPoint num="1" id="1250" />
-<TGConnectingPoint num="2" id="1251" />
-<TGConnectingPoint num="3" id="1252" />
-<TGConnectingPoint num="4" id="1253" />
-<TGConnectingPoint num="5" id="1254" />
-<TGConnectingPoint num="6" id="1255" />
-<TGConnectingPoint num="7" id="1256" />
-<TGConnectingPoint num="8" id="1257" />
-<TGConnectingPoint num="9" id="1258" />
-<TGConnectingPoint num="10" id="1259" />
-<TGConnectingPoint num="11" id="1260" />
-<TGConnectingPoint num="12" id="1261" />
-<TGConnectingPoint num="13" id="1262" />
-<TGConnectingPoint num="14" id="1263" />
-<TGConnectingPoint num="15" id="1264" />
-<TGConnectingPoint num="16" id="1265" />
-<TGConnectingPoint num="17" id="1266" />
-<TGConnectingPoint num="18" id="1267" />
-<TGConnectingPoint num="19" id="1268" />
-<TGConnectingPoint num="20" id="1269" />
-<TGConnectingPoint num="21" id="1270" />
-<TGConnectingPoint num="22" id="1271" />
-<TGConnectingPoint num="23" id="1272" />
-<TGConnectingPoint num="24" id="1273" />
-<TGConnectingPoint num="25" id="1274" />
-<TGConnectingPoint num="26" id="1275" />
-<TGConnectingPoint num="27" id="1276" />
-<TGConnectingPoint num="28" id="1277" />
-<TGConnectingPoint num="29" id="1278" />
-<TGConnectingPoint num="30" id="1279" />
-<TGConnectingPoint num="31" id="1280" />
-<TGConnectingPoint num="32" id="1281" />
-<TGConnectingPoint num="33" id="1282" />
-<TGConnectingPoint num="34" id="1283" />
-<TGConnectingPoint num="35" id="1284" />
-<TGConnectingPoint num="36" id="1285" />
-<TGConnectingPoint num="37" id="1286" />
-<TGConnectingPoint num="38" id="1287" />
-<TGConnectingPoint num="39" id="1288" />
+<TGConnectingPoint num="0" id="1013" />
+<TGConnectingPoint num="1" id="1014" />
+<TGConnectingPoint num="2" id="1015" />
+<TGConnectingPoint num="3" id="1016" />
+<TGConnectingPoint num="4" id="1017" />
+<TGConnectingPoint num="5" id="1018" />
+<TGConnectingPoint num="6" id="1019" />
+<TGConnectingPoint num="7" id="1020" />
+<TGConnectingPoint num="8" id="1021" />
+<TGConnectingPoint num="9" id="1022" />
+<TGConnectingPoint num="10" id="1023" />
+<TGConnectingPoint num="11" id="1024" />
+<TGConnectingPoint num="12" id="1025" />
+<TGConnectingPoint num="13" id="1026" />
+<TGConnectingPoint num="14" id="1027" />
+<TGConnectingPoint num="15" id="1028" />
+<TGConnectingPoint num="16" id="1029" />
+<TGConnectingPoint num="17" id="1030" />
+<TGConnectingPoint num="18" id="1031" />
+<TGConnectingPoint num="19" id="1032" />
+<TGConnectingPoint num="20" id="1033" />
+<TGConnectingPoint num="21" id="1034" />
+<TGConnectingPoint num="22" id="1035" />
+<TGConnectingPoint num="23" id="1036" />
+<TGConnectingPoint num="24" id="1037" />
+<TGConnectingPoint num="25" id="1038" />
+<TGConnectingPoint num="26" id="1039" />
+<TGConnectingPoint num="27" id="1040" />
+<TGConnectingPoint num="28" id="1041" />
+<TGConnectingPoint num="29" id="1042" />
+<TGConnectingPoint num="30" id="1043" />
+<TGConnectingPoint num="31" id="1044" />
+<TGConnectingPoint num="32" id="1045" />
+<TGConnectingPoint num="33" id="1046" />
+<TGConnectingPoint num="34" id="1047" />
+<TGConnectingPoint num="35" id="1048" />
+<TGConnectingPoint num="36" id="1049" />
+<TGConnectingPoint num="37" id="1050" />
+<TGConnectingPoint num="38" id="1051" />
+<TGConnectingPoint num="39" id="1052" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1330" >
-<cdparam x="309" y="688" />
-<sizeparam width="194" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1094" >
+<cdparam x="172" y="626" />
+<sizeparam width="393" 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="4000" />
 <infoparam name="State" value="calculate_sending_DH" />
-<TGConnectingPoint num="0" id="1290" />
-<TGConnectingPoint num="1" id="1291" />
-<TGConnectingPoint num="2" id="1292" />
-<TGConnectingPoint num="3" id="1293" />
-<TGConnectingPoint num="4" id="1294" />
-<TGConnectingPoint num="5" id="1295" />
-<TGConnectingPoint num="6" id="1296" />
-<TGConnectingPoint num="7" id="1297" />
-<TGConnectingPoint num="8" id="1298" />
-<TGConnectingPoint num="9" id="1299" />
-<TGConnectingPoint num="10" id="1300" />
-<TGConnectingPoint num="11" id="1301" />
-<TGConnectingPoint num="12" id="1302" />
-<TGConnectingPoint num="13" id="1303" />
-<TGConnectingPoint num="14" id="1304" />
-<TGConnectingPoint num="15" id="1305" />
-<TGConnectingPoint num="16" id="1306" />
-<TGConnectingPoint num="17" id="1307" />
-<TGConnectingPoint num="18" id="1308" />
-<TGConnectingPoint num="19" id="1309" />
-<TGConnectingPoint num="20" id="1310" />
-<TGConnectingPoint num="21" id="1311" />
-<TGConnectingPoint num="22" id="1312" />
-<TGConnectingPoint num="23" id="1313" />
-<TGConnectingPoint num="24" id="1314" />
-<TGConnectingPoint num="25" id="1315" />
-<TGConnectingPoint num="26" id="1316" />
-<TGConnectingPoint num="27" id="1317" />
-<TGConnectingPoint num="28" id="1318" />
-<TGConnectingPoint num="29" id="1319" />
-<TGConnectingPoint num="30" id="1320" />
-<TGConnectingPoint num="31" id="1321" />
-<TGConnectingPoint num="32" id="1322" />
-<TGConnectingPoint num="33" id="1323" />
-<TGConnectingPoint num="34" id="1324" />
-<TGConnectingPoint num="35" id="1325" />
-<TGConnectingPoint num="36" id="1326" />
-<TGConnectingPoint num="37" id="1327" />
-<TGConnectingPoint num="38" id="1328" />
-<TGConnectingPoint num="39" id="1329" />
+<TGConnectingPoint num="0" id="1054" />
+<TGConnectingPoint num="1" id="1055" />
+<TGConnectingPoint num="2" id="1056" />
+<TGConnectingPoint num="3" id="1057" />
+<TGConnectingPoint num="4" id="1058" />
+<TGConnectingPoint num="5" id="1059" />
+<TGConnectingPoint num="6" id="1060" />
+<TGConnectingPoint num="7" id="1061" />
+<TGConnectingPoint num="8" id="1062" />
+<TGConnectingPoint num="9" id="1063" />
+<TGConnectingPoint num="10" id="1064" />
+<TGConnectingPoint num="11" id="1065" />
+<TGConnectingPoint num="12" id="1066" />
+<TGConnectingPoint num="13" id="1067" />
+<TGConnectingPoint num="14" id="1068" />
+<TGConnectingPoint num="15" id="1069" />
+<TGConnectingPoint num="16" id="1070" />
+<TGConnectingPoint num="17" id="1071" />
+<TGConnectingPoint num="18" id="1072" />
+<TGConnectingPoint num="19" id="1073" />
+<TGConnectingPoint num="20" id="1074" />
+<TGConnectingPoint num="21" id="1075" />
+<TGConnectingPoint num="22" id="1076" />
+<TGConnectingPoint num="23" id="1077" />
+<TGConnectingPoint num="24" id="1078" />
+<TGConnectingPoint num="25" id="1079" />
+<TGConnectingPoint num="26" id="1080" />
+<TGConnectingPoint num="27" id="1081" />
+<TGConnectingPoint num="28" id="1082" />
+<TGConnectingPoint num="29" id="1083" />
+<TGConnectingPoint num="30" id="1084" />
+<TGConnectingPoint num="31" id="1085" />
+<TGConnectingPoint num="32" id="1086" />
+<TGConnectingPoint num="33" id="1087" />
+<TGConnectingPoint num="34" id="1088" />
+<TGConnectingPoint num="35" id="1089" />
+<TGConnectingPoint num="36" id="1090" />
+<TGConnectingPoint num="37" id="1091" />
+<TGConnectingPoint num="38" id="1092" />
+<TGConnectingPoint num="39" id="1093" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1371" >
-<cdparam x="324" y="473" />
-<sizeparam width="165" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1135" >
+<cdparam x="249" y="487" />
+<sizeparam width="261" 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="4000" />
-<infoparam name="State" value="KDF_RK_receiving" />
-<TGConnectingPoint num="0" id="1331" />
-<TGConnectingPoint num="1" id="1332" />
-<TGConnectingPoint num="2" id="1333" />
-<TGConnectingPoint num="3" id="1334" />
-<TGConnectingPoint num="4" id="1335" />
-<TGConnectingPoint num="5" id="1336" />
-<TGConnectingPoint num="6" id="1337" />
-<TGConnectingPoint num="7" id="1338" />
-<TGConnectingPoint num="8" id="1339" />
-<TGConnectingPoint num="9" id="1340" />
-<TGConnectingPoint num="10" id="1341" />
-<TGConnectingPoint num="11" id="1342" />
-<TGConnectingPoint num="12" id="1343" />
-<TGConnectingPoint num="13" id="1344" />
-<TGConnectingPoint num="14" id="1345" />
-<TGConnectingPoint num="15" id="1346" />
-<TGConnectingPoint num="16" id="1347" />
-<TGConnectingPoint num="17" id="1348" />
-<TGConnectingPoint num="18" id="1349" />
-<TGConnectingPoint num="19" id="1350" />
-<TGConnectingPoint num="20" id="1351" />
-<TGConnectingPoint num="21" id="1352" />
-<TGConnectingPoint num="22" id="1353" />
-<TGConnectingPoint num="23" id="1354" />
-<TGConnectingPoint num="24" id="1355" />
-<TGConnectingPoint num="25" id="1356" />
-<TGConnectingPoint num="26" id="1357" />
-<TGConnectingPoint num="27" id="1358" />
-<TGConnectingPoint num="28" id="1359" />
-<TGConnectingPoint num="29" id="1360" />
-<TGConnectingPoint num="30" id="1361" />
-<TGConnectingPoint num="31" id="1362" />
-<TGConnectingPoint num="32" id="1363" />
-<TGConnectingPoint num="33" id="1364" />
-<TGConnectingPoint num="34" id="1365" />
-<TGConnectingPoint num="35" id="1366" />
-<TGConnectingPoint num="36" id="1367" />
-<TGConnectingPoint num="37" id="1368" />
-<TGConnectingPoint num="38" id="1369" />
-<TGConnectingPoint num="39" id="1370" />
+<infoparam name="State" value="sending_message" />
+<TGConnectingPoint num="0" id="1095" />
+<TGConnectingPoint num="1" id="1096" />
+<TGConnectingPoint num="2" id="1097" />
+<TGConnectingPoint num="3" id="1098" />
+<TGConnectingPoint num="4" id="1099" />
+<TGConnectingPoint num="5" id="1100" />
+<TGConnectingPoint num="6" id="1101" />
+<TGConnectingPoint num="7" id="1102" />
+<TGConnectingPoint num="8" id="1103" />
+<TGConnectingPoint num="9" id="1104" />
+<TGConnectingPoint num="10" id="1105" />
+<TGConnectingPoint num="11" id="1106" />
+<TGConnectingPoint num="12" id="1107" />
+<TGConnectingPoint num="13" id="1108" />
+<TGConnectingPoint num="14" id="1109" />
+<TGConnectingPoint num="15" id="1110" />
+<TGConnectingPoint num="16" id="1111" />
+<TGConnectingPoint num="17" id="1112" />
+<TGConnectingPoint num="18" id="1113" />
+<TGConnectingPoint num="19" id="1114" />
+<TGConnectingPoint num="20" id="1115" />
+<TGConnectingPoint num="21" id="1116" />
+<TGConnectingPoint num="22" id="1117" />
+<TGConnectingPoint num="23" id="1118" />
+<TGConnectingPoint num="24" id="1119" />
+<TGConnectingPoint num="25" id="1120" />
+<TGConnectingPoint num="26" id="1121" />
+<TGConnectingPoint num="27" id="1122" />
+<TGConnectingPoint num="28" id="1123" />
+<TGConnectingPoint num="29" id="1124" />
+<TGConnectingPoint num="30" id="1125" />
+<TGConnectingPoint num="31" id="1126" />
+<TGConnectingPoint num="32" id="1127" />
+<TGConnectingPoint num="33" id="1128" />
+<TGConnectingPoint num="34" id="1129" />
+<TGConnectingPoint num="35" id="1130" />
+<TGConnectingPoint num="36" id="1131" />
+<TGConnectingPoint num="37" id="1132" />
+<TGConnectingPoint num="38" id="1133" />
+<TGConnectingPoint num="39" id="1134" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1412" >
-<cdparam x="320" y="308" />
-<sizeparam width="173" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1146" >
+<cdparam x="237" y="413" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Calculate_receiv_DH" />
-<TGConnectingPoint num="0" id="1372" />
-<TGConnectingPoint num="1" id="1373" />
-<TGConnectingPoint num="2" id="1374" />
-<TGConnectingPoint num="3" id="1375" />
-<TGConnectingPoint num="4" id="1376" />
-<TGConnectingPoint num="5" id="1377" />
-<TGConnectingPoint num="6" id="1378" />
-<TGConnectingPoint num="7" id="1379" />
-<TGConnectingPoint num="8" id="1380" />
-<TGConnectingPoint num="9" id="1381" />
-<TGConnectingPoint num="10" id="1382" />
-<TGConnectingPoint num="11" id="1383" />
-<TGConnectingPoint num="12" id="1384" />
-<TGConnectingPoint num="13" id="1385" />
-<TGConnectingPoint num="14" id="1386" />
-<TGConnectingPoint num="15" id="1387" />
-<TGConnectingPoint num="16" id="1388" />
-<TGConnectingPoint num="17" id="1389" />
-<TGConnectingPoint num="18" id="1390" />
-<TGConnectingPoint num="19" id="1391" />
-<TGConnectingPoint num="20" id="1392" />
-<TGConnectingPoint num="21" id="1393" />
-<TGConnectingPoint num="22" id="1394" />
-<TGConnectingPoint num="23" id="1395" />
-<TGConnectingPoint num="24" id="1396" />
-<TGConnectingPoint num="25" id="1397" />
-<TGConnectingPoint num="26" id="1398" />
-<TGConnectingPoint num="27" id="1399" />
-<TGConnectingPoint num="28" id="1400" />
-<TGConnectingPoint num="29" id="1401" />
-<TGConnectingPoint num="30" id="1402" />
-<TGConnectingPoint num="31" id="1403" />
-<TGConnectingPoint num="32" id="1404" />
-<TGConnectingPoint num="33" id="1405" />
-<TGConnectingPoint num="34" id="1406" />
-<TGConnectingPoint num="35" id="1407" />
-<TGConnectingPoint num="36" id="1408" />
-<TGConnectingPoint num="37" id="1409" />
-<TGConnectingPoint num="38" id="1410" />
-<TGConnectingPoint num="39" id="1411" />
-<extraparam>
-</extraparam>
+<infoparam name="Receive signal" value="chin(filler3)" />
+<TGConnectingPoint num="0" id="1136" />
+<TGConnectingPoint num="1" id="1137" />
+<TGConnectingPoint num="2" id="1138" />
+<TGConnectingPoint num="3" id="1139" />
+<TGConnectingPoint num="4" id="1140" />
+<TGConnectingPoint num="5" id="1141" />
+<TGConnectingPoint num="6" id="1142" />
+<TGConnectingPoint num="7" id="1143" />
+<TGConnectingPoint num="8" id="1144" />
+<TGConnectingPoint num="9" id="1145" />
 </COMPONENT>
 
-<COMPONENT type="5104" id="1423" >
-<cdparam x="366" y="211" />
-<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="1148" >
+<cdparam x="219" y="3433" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Receive signal" value="chin(filler)" />
-<TGConnectingPoint num="0" id="1413" />
-<TGConnectingPoint num="1" id="1414" />
-<TGConnectingPoint num="2" id="1415" />
-<TGConnectingPoint num="3" id="1416" />
-<TGConnectingPoint num="4" id="1417" />
-<TGConnectingPoint num="5" id="1418" />
-<TGConnectingPoint num="6" id="1419" />
-<TGConnectingPoint num="7" id="1420" />
-<TGConnectingPoint num="8" id="1421" />
-<TGConnectingPoint num="9" id="1422" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1147" />
 </COMPONENT>
 
-<COMPONENT type="5103" id="1434" >
-<cdparam x="292" y="93" />
-<sizeparam width="230" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="1159" >
+<cdparam x="263" y="181" />
+<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(requestBobPublicKeyBundle)" />
-<TGConnectingPoint num="0" id="1424" />
-<TGConnectingPoint num="1" id="1425" />
-<TGConnectingPoint num="2" id="1426" />
-<TGConnectingPoint num="3" id="1427" />
-<TGConnectingPoint num="4" id="1428" />
-<TGConnectingPoint num="5" id="1429" />
-<TGConnectingPoint num="6" id="1430" />
-<TGConnectingPoint num="7" id="1431" />
-<TGConnectingPoint num="8" id="1432" />
-<TGConnectingPoint num="9" id="1433" />
+<infoparam name="Send signal" value="chout(filler)" />
+<TGConnectingPoint num="0" id="1149" />
+<TGConnectingPoint num="1" id="1150" />
+<TGConnectingPoint num="2" id="1151" />
+<TGConnectingPoint num="3" id="1152" />
+<TGConnectingPoint num="4" id="1153" />
+<TGConnectingPoint num="5" id="1154" />
+<TGConnectingPoint num="6" id="1155" />
+<TGConnectingPoint num="7" id="1156" />
+<TGConnectingPoint num="8" id="1157" />
+<TGConnectingPoint num="9" id="1158" />
 </COMPONENT>
 
-<COMPONENT type="5100" id="1436" >
-<cdparam x="400" y="50" />
+<COMPONENT type="5100" id="1161" >
+<cdparam x="305" y="47" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1435" />
+<TGConnectingPoint num="0" id="1160" />
 </COMPONENT>
 
 
 </AVATARStateMachineDiagramPanel>
 
-<AVATARStateMachineDiagramPanel name="Bob" minX="10" maxX="2500" minY="10" maxY="4000" >
-<CONNECTOR type="5102" id="1443" >
-<cdparam x="312" y="226" />
+<AVATARStateMachineDiagramPanel name="Alice" minX="10" maxX="2500" minY="10" maxY="4000" >
+<CONNECTOR type="5102" id="1168" >
+<cdparam x="407" y="118" />
 <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="1442" />
-<P1  x="304" y="206" id="2304" />
-<P2  x="245" y="245" id="1619" />
+<TGConnectingPoint num="0" id="1167" />
+<P1  x="407" y="118" id="2143" />
+<P2  x="406" y="137" id="1365" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1441" >
-<father id="1443" num="0" />
-<cdparam x="265" y="248" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1166" >
+<father id="1168" num="0" />
+<cdparam x="358" y="130" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1437" />
-<TGConnectingPoint num="1" id="1438" />
-<TGConnectingPoint num="2" id="1439" />
-<TGConnectingPoint num="3" id="1440" />
+<TGConnectingPoint num="0" id="1162" />
+<TGConnectingPoint num="1" id="1163" />
+<TGConnectingPoint num="2" id="1164" />
+<TGConnectingPoint num="3" id="1165" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3152,26 +2574,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1450" >
-<cdparam x="312" y="67" />
+<CONNECTOR type="5102" id="1175" >
+<cdparam x="207" y="3397" />
 <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="1449" />
-<P1  x="312" y="67" id="2314" />
-<P2  x="312" y="90" id="1622" />
+<TGConnectingPoint num="0" id="1174" />
+<P1  x="406" y="2436" id="1426" />
+<P2  x="406" y="2523" id="1380" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1448" >
-<father id="1450" num="0" />
-<cdparam x="327" y="95" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1173" >
+<father id="1175" num="0" />
+<cdparam x="429" y="2457" />
+<sizeparam width="266" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1444" />
-<TGConnectingPoint num="1" id="1445" />
-<TGConnectingPoint num="2" id="1446" />
-<TGConnectingPoint num="3" id="1447" />
+<TGConnectingPoint num="0" id="1169" />
+<TGConnectingPoint num="1" id="1170" />
+<TGConnectingPoint num="2" id="1171" />
+<TGConnectingPoint num="3" id="1172" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3179,29 +2601,33 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="next_K_a = pk(next_Ks_a) " enabled="true"/>
+<actions value="tmp1.Message = next_K_a.Key" enabled="true"/>
+<actions value="tmp2.Message = curr_K_a.Key " enabled="true"/>
+<actions value="filler6 = concat4(tmp1,tmp2, 1, a2_cipher)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1457" >
-<cdparam x="378" y="269" />
+<CONNECTOR type="5102" id="1182" >
+<cdparam x="140" y="2457" />
 <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="1456" />
-<P1  x="266" y="389" id="1626" />
-<P2  x="281" y="408" id="2290" />
+<TGConnectingPoint num="0" id="1181" />
+<P1  x="406" y="1895" id="1508" />
+<P2  x="406" y="1922" id="1546" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1455" >
-<father id="1457" num="0" />
-<cdparam x="379" y="311" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1180" >
+<father id="1182" num="0" />
+<cdparam x="162" y="2473" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1451" />
-<TGConnectingPoint num="1" id="1452" />
-<TGConnectingPoint num="2" id="1453" />
-<TGConnectingPoint num="3" id="1454" />
+<TGConnectingPoint num="0" id="1176" />
+<TGConnectingPoint num="1" id="1177" />
+<TGConnectingPoint num="2" id="1178" />
+<TGConnectingPoint num="3" id="1179" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3212,26 +2638,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1464" >
-<cdparam x="404" y="170" />
+<CONNECTOR type="5102" id="1189" >
+<cdparam x="129" y="2503" />
 <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="1463" />
-<P1  x="245" y="275" id="1620" />
-<P2  x="266" y="359" id="1625" />
+<TGConnectingPoint num="0" id="1188" />
+<P1  x="406" y="2017" id="1544" />
+<P2  x="406" y="2078" id="1599" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1462" >
-<father id="1464" num="0" />
-<cdparam x="309" y="301" />
-<sizeparam width="204" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1187" >
+<father id="1189" num="0" />
+<cdparam x="420" y="2040" />
+<sizeparam width="255" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1458" />
-<TGConnectingPoint num="1" id="1459" />
-<TGConnectingPoint num="2" id="1460" />
-<TGConnectingPoint num="3" id="1461" />
+<TGConnectingPoint num="0" id="1183" />
+<TGConnectingPoint num="1" id="1184" />
+<TGConnectingPoint num="2" id="1185" />
+<TGConnectingPoint num="3" id="1186" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3239,33 +2665,128 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_Ks_b.Key = tmp3" enabled="true"/>
-<actions value="next_K_b=pk(next_Ks_b) " enabled="true"/>
-<actions value="tmp2.Message =  next_K_b.Key" enabled="true"/>
-<actions value="filler2.Message = tmp2.Message" enabled="true"/>
+<actions value=" next_Ks_a.Key = tmp3" enabled="true"/>
+<actions value=" DH_sending =  DH( next_K_b,next_Ks_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1471" >
-<cdparam x="265" y="2904" />
+<CONNECTOR type="5102" id="1196" >
+<cdparam x="213" y="2462" />
 <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="1470" />
-<P1  x="266" y="3120" id="1683" />
-<P2  x="249" y="3242" id="1637" />
+<TGConnectingPoint num="0" id="1195" />
+<P1  x="406" y="1952" id="1547" />
+<P2  x="406" y="1987" id="1543" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1469" >
-<father id="1471" num="0" />
-<cdparam x="272" y="3188" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1194" >
+<father id="1196" num="0" />
+<cdparam x="428" y="1970" />
+<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1190" />
+<TGConnectingPoint num="1" id="1191" />
+<TGConnectingPoint num="2" id="1192" />
+<TGConnectingPoint num="3" id="1193" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="next_K_b.Key = filler5.Message" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1203" >
+<cdparam x="162" y="2361" />
+<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="1202" />
+<P1  x="406" y="1755" id="1648" />
+<P2  x="406" y="1865" id="1503" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1201" >
+<father id="1203" num="0" />
+<cdparam x="426" y="1777" />
+<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1197" />
+<TGConnectingPoint num="1" id="1198" />
+<TGConnectingPoint num="2" id="1199" />
+<TGConnectingPoint num="3" id="1200" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = RK.Key" enabled="true"/>
+<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
+<actions value="tmp1=hash(tmp4)" enabled="true"/>
+<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
+<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1210" >
+<cdparam x="251" y="2129" />
+<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="1209" />
+<P1  x="406" y="1600" id="1691" />
+<P2  x="406" y="1628" id="1639" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1208" >
+<father id="1210" num="0" />
+<cdparam x="228" y="2148" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="1204" />
+<TGConnectingPoint num="1" id="1205" />
+<TGConnectingPoint num="2" id="1206" />
+<TGConnectingPoint num="3" id="1207" />
+<extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+</extraparam>
+</SUBCOMPONENT>
+
+<CONNECTOR type="5102" id="1217" >
+<cdparam x="274" y="1973" />
+<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="1216" />
+<P1  x="406" y="1512" id="1732" />
+<P2  x="406" y="1570" id="1686" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1215" >
+<father id="1217" num="0" />
+<cdparam x="423" y="1548" />
 <sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1465" />
-<TGConnectingPoint num="1" id="1466" />
-<TGConnectingPoint num="2" id="1467" />
-<TGConnectingPoint num="3" id="1468" />
+<TGConnectingPoint num="0" id="1211" />
+<TGConnectingPoint num="1" id="1212" />
+<TGConnectingPoint num="2" id="1213" />
+<TGConnectingPoint num="3" id="1214" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3277,26 +2798,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1478" >
-<cdparam x="258" y="2757" />
+<CONNECTOR type="5102" id="1224" >
+<cdparam x="272" y="1722" />
 <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="1477" />
-<P1  x="219" y="2826" id="1724" />
-<P2  x="266" y="3070" id="1678" />
+<TGConnectingPoint num="0" id="1223" />
+<P1  x="406" y="1373" id="1779" />
+<P2  x="406" y="1396" id="1767" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1476" >
-<father id="1478" num="0" />
-<cdparam x="265" y="2930" />
-<sizeparam width="212" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1222" >
+<father id="1224" num="0" />
+<cdparam x="266" y="1767" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1472" />
-<TGConnectingPoint num="1" id="1473" />
-<TGConnectingPoint num="2" id="1474" />
-<TGConnectingPoint num="3" id="1475" />
+<TGConnectingPoint num="0" id="1218" />
+<TGConnectingPoint num="1" id="1219" />
+<TGConnectingPoint num="2" id="1220" />
+<TGConnectingPoint num="3" id="1221" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3304,32 +2825,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = CK_receiving.Key" enabled="true"/>
-<actions value="tmp4 = hash(tmp1)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1485" >
-<cdparam x="267" y="2631" />
+<CONNECTOR type="5102" id="1231" >
+<cdparam x="272" y="1469" />
 <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="1484" />
-<P1  x="267" y="2631" id="1765" />
-<P2  x="219" y="2776" id="1719" />
+<TGConnectingPoint num="0" id="1230" />
+<P1  x="406" y="1184" id="1836" />
+<P2  x="406" y="1283" id="1790" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1483" >
-<father id="1485" num="0" />
-<cdparam x="266" y="2658" />
-<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1229" >
+<father id="1231" num="0" />
+<cdparam x="428" y="1215" />
+<sizeparam width="258" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1479" />
-<TGConnectingPoint num="1" id="1480" />
-<TGConnectingPoint num="2" id="1481" />
-<TGConnectingPoint num="3" id="1482" />
+<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"/>
@@ -3337,35 +2855,33 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = RK.Key" enabled="true"/>
-<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
-<actions value="tmp1=hash(tmp4)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
-<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
+<actions value="next_K_a = pk(next_Ks_a) " enabled="true"/>
+<actions value="tmp1.Message = next_K_a.Key" enabled="true"/>
+<actions value="tmp2.Message = curr_K_a.Key " enabled="true"/>
+<actions value="filler3 = concat4(tmp1,tmp2, 1, a_cipher)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1492" >
-<cdparam x="272" y="2380" />
+<CONNECTOR type="5102" id="1238" >
+<cdparam x="261" y="1337" />
 <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="1491" />
-<P1  x="196" y="2322" id="1842" />
-<P2  x="250" y="2440" id="1801" />
+<TGConnectingPoint num="0" id="1237" />
+<P1  x="406" y="1094" id="1891" />
+<P2  x="406" y="1154" id="1831" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1490" >
-<father id="1492" num="0" />
-<cdparam x="254" y="2350" />
-<sizeparam width="265" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1236" >
+<father id="1238" num="0" />
+<cdparam x="427" y="1127" />
+<sizeparam width="226" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1486" />
-<TGConnectingPoint num="1" id="1487" />
-<TGConnectingPoint num="2" id="1488" />
-<TGConnectingPoint num="3" id="1489" />
+<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"/>
@@ -3373,32 +2889,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="get4(filler3, tmp1 ,tmp2, tmp4 , m_cipher) " enabled="true"/>
-<actions value="next_K_a.Key = tmp1.Message" enabled="true"/>
-<actions value="curr_K_a.Key = tmp2.Message" enabled="true"/>
+<actions value="a_cipher = sencrypt(a, CK_sending) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1499" >
-<cdparam x="292" y="2219" />
+<CONNECTOR type="5102" id="1245" >
+<cdparam x="254" y="692" />
 <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="1498" />
-<P1  x="288" y="2170" id="1853" />
-<P2  x="246" y="2226" id="1855" />
+<TGConnectingPoint num="0" id="1244" />
+<P1  x="406" y="627" id="1872" />
+<P2  x="406" y="688" id="2009" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1497" >
-<father id="1499" num="0" />
-<cdparam x="319" y="2191" />
-<sizeparam width="204" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1243" >
+<father id="1245" num="0" />
+<cdparam x="428" y="652" />
+<sizeparam width="255" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1493" />
-<TGConnectingPoint num="1" id="1494" />
-<TGConnectingPoint num="2" id="1495" />
-<TGConnectingPoint num="3" id="1496" />
+<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"/>
@@ -3406,33 +2920,31 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="next_Ks_b.Key = tmp3" enabled="true"/>
-<actions value="next_K_b = pk(curr_Ks_b) " enabled="true"/>
-<actions value="tmp1.Message = next_K_b.Key" enabled="true"/>
-<actions value="filler5.Message = tmp1.Message" enabled="true"/>
+<actions value=" next_Ks_a.Key = tmp3" enabled="true"/>
+<actions value=" DH_sending =  DH( next_K_b,next_Ks_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1506" >
-<cdparam x="257" y="1734" />
+<CONNECTOR type="5102" id="1252" >
+<cdparam x="369" y="597" />
 <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="1505" />
-<P1  x="224" y="1716" id="1968" />
-<P2  x="276" y="1786" id="1922" />
+<TGConnectingPoint num="0" id="1251" />
+<P1  x="406" y="559" id="1875" />
+<P2  x="406" y="597" id="1871" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1504" >
-<father id="1506" num="0" />
-<cdparam x="289" y="1737" />
-<sizeparam width="226" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1250" >
+<father id="1252" num="0" />
+<cdparam x="429" y="584" />
+<sizeparam width="191" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1500" />
-<TGConnectingPoint num="1" id="1501" />
-<TGConnectingPoint num="2" id="1502" />
-<TGConnectingPoint num="3" id="1503" />
+<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"/>
@@ -3440,30 +2952,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="b_cipher = sencrypt(b, CK_sending) " enabled="true"/>
+<actions value="next_K_b.Key = filler2.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1513" >
-<cdparam x="247" y="1591" />
+<CONNECTOR type="5102" id="1259" >
+<cdparam x="380" y="515" />
 <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="1512" />
-<P1  x="247" y="1591" id="2009" />
-<P2  x="224" y="1666" id="1963" />
+<TGConnectingPoint num="0" id="1258" />
+<P1  x="406" y="503" id="2055" />
+<P2  x="406" y="529" id="1874" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1511" >
-<father id="1513" num="0" />
-<cdparam x="280" y="1646" />
-<sizeparam width="238" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1257" >
+<father id="1259" num="0" />
+<cdparam x="374" y="541" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1507" />
-<TGConnectingPoint num="1" id="1508" />
-<TGConnectingPoint num="2" id="1509" />
-<TGConnectingPoint num="3" id="1510" />
+<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"/>
@@ -3471,30 +2983,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="m = sdecrypt(m_cipher, CK_receiving) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1520" >
-<cdparam x="267" y="1376" />
+<CONNECTOR type="5102" id="1266" >
+<cdparam x="341" y="997" />
 <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="1519" />
-<P1  x="265" y="1425" id="2050" />
-<P2  x="247" y="1541" id="2004" />
+<TGConnectingPoint num="0" id="1265" />
+<P1  x="406" y="961" id="1932" />
+<P2  x="406" y="1064" id="1886" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1518" >
-<father id="1520" num="0" />
-<cdparam x="271" y="1470" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1264" >
+<father id="1266" num="0" />
+<cdparam x="427" y="1001" />
 <sizeparam width="206" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1514" />
-<TGConnectingPoint num="1" id="1515" />
-<TGConnectingPoint num="2" id="1516" />
-<TGConnectingPoint num="3" id="1517" />
+<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"/>
@@ -3508,26 +3019,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1527" >
-<cdparam x="272" y="1281" />
+<CONNECTOR type="5102" id="1273" >
+<cdparam x="359" y="868" />
 <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="1526" />
-<P1  x="272" y="1281" id="2091" />
-<P2  x="265" y="1375" id="2045" />
+<TGConnectingPoint num="0" id="1272" />
+<P1  x="406" y="851" id="1973" />
+<P2  x="406" y="931" id="1927" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1525" >
-<father id="1527" num="0" />
-<cdparam x="286" y="1320" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1271" >
+<father id="1273" num="0" />
+<cdparam x="431" y="879" />
 <sizeparam width="212" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1521" />
-<TGConnectingPoint num="1" id="1522" />
-<TGConnectingPoint num="2" id="1523" />
-<TGConnectingPoint num="3" id="1524" />
+<TGConnectingPoint num="0" id="1267" />
+<TGConnectingPoint num="1" id="1268" />
+<TGConnectingPoint num="2" id="1269" />
+<TGConnectingPoint num="3" id="1270" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3541,26 +3052,26 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1534" >
-<cdparam x="344" y="931" />
+<CONNECTOR type="5102" id="1280" >
+<cdparam x="377" y="734" />
 <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="1533" />
-<P1  x="350" y="859" id="2173" />
-<P2  x="329" y="1051" id="2127" />
+<TGConnectingPoint num="0" id="1279" />
+<P1  x="406" y="718" id="2014" />
+<P2  x="406" y="821" id="1968" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1532" >
-<father id="1534" num="0" />
-<cdparam x="375" y="990" />
-<sizeparam width="257" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1278" >
+<father id="1280" num="0" />
+<cdparam x="432" y="736" />
+<sizeparam width="212" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1528" />
-<TGConnectingPoint num="1" id="1529" />
-<TGConnectingPoint num="2" id="1530" />
-<TGConnectingPoint num="3" id="1531" />
+<TGConnectingPoint num="0" id="1274" />
+<TGConnectingPoint num="1" id="1275" />
+<TGConnectingPoint num="2" id="1276" />
+<TGConnectingPoint num="3" id="1277" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3568,30 +3079,35 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="DH_receiving = DH(next_K_a , next_Ks_b) " enabled="true"/>
+<actions value="tmp1.Message = DH_sending.Key" enabled="true"/>
+<actions value="tmp2.Message = CK_receiving.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
+<actions value="tmp1 = hash(tmp4)" enabled="true"/>
+<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
+<actions value="RK.Key = CK_sending.Key" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1541" >
-<cdparam x="373" y="710" />
+<CONNECTOR type="5102" id="1287" >
+<cdparam x="396" y="427" />
 <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="1540" />
-<P1  x="368" y="676" id="2214" />
-<P2  x="350" y="809" id="2168" />
+<TGConnectingPoint num="0" id="1286" />
+<P1  x="406" y="338" id="2096" />
+<P2  x="406" y="473" id="2050" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1539" >
-<father id="1541" num="0" />
-<cdparam x="395" y="699" />
-<sizeparam width="209" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1285" >
+<father id="1287" num="0" />
+<cdparam x="425" y="373" />
+<sizeparam width="215" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1535" />
-<TGConnectingPoint num="1" id="1536" />
-<TGConnectingPoint num="2" id="1537" />
-<TGConnectingPoint num="3" id="1538" />
+<TGConnectingPoint num="0" id="1281" />
+<TGConnectingPoint num="1" id="1282" />
+<TGConnectingPoint num="2" id="1283" />
+<TGConnectingPoint num="3" id="1284" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3600,33 +3116,34 @@
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
 <actions value="tmp1.Message = RK.Key" enabled="true"/>
-<actions value="tmp2.Message = DH_sending.Key" enabled="true"/>
+<actions value="tmp2.Message = DH_receiving.Key" enabled="true"/>
 <actions value="tmp4 = concat2(tmp1, tmp2) " enabled="true"/>
 <actions value="tmp1=hash(tmp4)" enabled="true"/>
-<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
+<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
+<actions value="RK.Key = CK_receiving.Key" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1548" >
-<cdparam x="379" y="537" />
+<CONNECTOR type="5102" id="1294" >
+<cdparam x="403" y="265" />
 <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="1547" />
-<P1  x="379" y="537" id="2255" />
-<P2  x="368" y="626" id="2209" />
+<TGConnectingPoint num="0" id="1293" />
+<P1  x="406" y="236" id="2132" />
+<P2  x="406" y="308" id="2091" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1546" >
-<father id="1548" num="0" />
-<cdparam x="405" y="588" />
-<sizeparam width="247" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1292" >
+<father id="1294" num="0" />
+<cdparam x="428" y="266" />
+<sizeparam width="249" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1542" />
-<TGConnectingPoint num="1" id="1543" />
-<TGConnectingPoint num="2" id="1544" />
-<TGConnectingPoint num="3" id="1545" />
+<TGConnectingPoint num="0" id="1288" />
+<TGConnectingPoint num="1" id="1289" />
+<TGConnectingPoint num="2" id="1290" />
+<TGConnectingPoint num="3" id="1291" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3634,30 +3151,31 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="DH_sending = DH(curr_K_a , curr_Ks_b) " enabled="true"/>
+<actions value="curr_K_b.Key = filler.Message" enabled="true"/>
+<actions value="DH_receiving = DH(curr_K_b, curr_Ks_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1555" >
-<cdparam x="381" y="383" />
+<CONNECTOR type="5102" id="1301" >
+<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="1554" />
-<P1  x="281" y="438" id="2291" />
-<P2  x="379" y="487" id="2250" />
+<TGConnectingPoint num="0" id="1300" />
+<P1  x="407" y="70" id="2153" />
+<P2  x="407" y="88" id="2142" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1553" >
-<father id="1555" num="0" />
-<cdparam x="362" y="438" />
-<sizeparam width="242" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1299" >
+<father id="1301" num="0" />
+<cdparam x="416" y="91" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1549" />
-<TGConnectingPoint num="1" id="1550" />
-<TGConnectingPoint num="2" id="1551" />
-<TGConnectingPoint num="3" id="1552" />
+<TGConnectingPoint num="0" id="1295" />
+<TGConnectingPoint num="1" id="1296" />
+<TGConnectingPoint num="2" id="1297" />
+<TGConnectingPoint num="3" id="1298" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3665,66 +3183,61 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="get4(filler3, tmp1 ,tmp2, N , m_cipher) " enabled="true"/>
-<actions value="next_K_a.Key = tmp1.Message" enabled="true"/>
-<actions value="curr_K_a.Key = tmp2.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1562" >
-<cdparam x="407" y="70" />
+<CONNECTOR type="5102" id="1308" >
+<cdparam x="408" y="166" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
-<TGConnectingPoint num="0" id="1561" />
-<P1  x="312" y="120" id="1623" />
-<P2  x="304" y="176" id="2303" />
+<TGConnectingPoint num="0" id="1307" />
+<P1  x="406" y="167" id="1366" />
+<P2  x="406" y="206" id="2131" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1560" >
-<father id="1562" num="0" />
-<cdparam x="339" y="138" />
-<sizeparam width="196" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1306" >
+<father id="1308" num="0" />
+<cdparam x="428" y="183" />
+<sizeparam width="150" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1556" />
-<TGConnectingPoint num="1" id="1557" />
-<TGConnectingPoint num="2" id="1558" />
-<TGConnectingPoint num="3" id="1559" />
+<TGConnectingPoint num="0" id="1302" />
+<TGConnectingPoint num="1" id="1303" />
+<TGConnectingPoint num="2" id="1304" />
+<TGConnectingPoint num="3" id="1305" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
 <afterMax value="" enabled="true"/>
-<computeMin value="" enabled="true"/>
-<computeMax value="" enabled="true"/>
-<probability value="" enabled="true"/>
-<actions value="curr_Ks_b.Key = tmp3" enabled="true"/>
-<actions value="curr_K_b=pk(curr_Ks_b) " enabled="true"/>
-<actions value="tmp1.Message = curr_K_b.Key" enabled="true"/>
-<actions value="filler.Message = tmp1.Message" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="curr_Ks_a.Key = tmp3" enabled="true"/>
+<actions value="curr_K_a=pk(curr_Ks_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1569" >
-<cdparam x="291" y="1101" />
+<CONNECTOR type="5102" id="1315" >
+<cdparam x="274" y="1618" />
 <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="1568" />
-<P1  x="291" y="1101" id="2155" />
-<P2  x="272" y="1231" id="2086" />
+<TGConnectingPoint num="0" id="1314" />
+<P1  x="406" y="1313" id="1795" />
+<P2  x="406" y="1343" id="1778" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1567" >
-<father id="1569" num="0" />
-<cdparam x="324" y="1131" />
-<sizeparam width="215" height="75" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1313" >
+<father id="1315" num="0" />
+<cdparam x="276" y="1663" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1563" />
-<TGConnectingPoint num="1" id="1564" />
-<TGConnectingPoint num="2" id="1565" />
-<TGConnectingPoint num="3" id="1566" />
+<TGConnectingPoint num="0" id="1309" />
+<TGConnectingPoint num="1" id="1310" />
+<TGConnectingPoint num="2" id="1311" />
+<TGConnectingPoint num="3" id="1312" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3732,34 +3245,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="tmp1.Message = DH_receiving.Key" enabled="true"/>
-<actions value="tmp2.Message = CK_sending.Key" enabled="true"/>
-<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
-<actions value="tmp1 = hash(tmp4)" enabled="true"/>
-<actions value="CK_receiving.Key = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1576" >
-<cdparam x="319" y="2061" />
+<CONNECTOR type="5102" id="1322" >
+<cdparam x="260" y="1843" />
 <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="1575" />
-<P1  x="319" y="2061" id="1910" />
-<P2  x="296" y="2087" id="1869" />
+<TGConnectingPoint num="0" id="1321" />
+<P1  x="406" y="1426" id="1768" />
+<P2  x="406" y="1482" id="1727" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1574" >
-<father id="1576" num="0" />
-<cdparam x="315" y="2096" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1320" >
+<father id="1322" num="0" />
+<cdparam x="423" y="1453" />
+<sizeparam width="221" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1570" />
-<TGConnectingPoint num="1" id="1571" />
-<TGConnectingPoint num="2" id="1572" />
-<TGConnectingPoint num="3" id="1573" />
+<TGConnectingPoint num="0" id="1316" />
+<TGConnectingPoint num="1" id="1317" />
+<TGConnectingPoint num="2" id="1318" />
+<TGConnectingPoint num="3" id="1319" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3767,29 +3275,31 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="get3(filler4, tmp1, tmp2, m_cipher) " enabled="true"/>
+<actions value="curr_K_b.Key = tmp1.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1583" >
-<cdparam x="312" y="2162" />
+<CONNECTOR type="5102" id="1329" >
+<cdparam x="330" y="2129" />
 <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="1582" />
-<P1  x="296" y="2117" id="1870" />
-<P2  x="288" y="2140" id="1852" />
+<TGConnectingPoint num="0" id="1328" />
+<P1  x="406" y="1658" id="1640" />
+<P2  x="406" y="1725" id="1643" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1581" >
-<father id="1583" num="0" />
-<cdparam x="305" y="2191" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1327" >
+<father id="1329" num="0" />
+<cdparam x="426" y="1677" />
+<sizeparam width="249" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1577" />
-<TGConnectingPoint num="1" id="1578" />
-<TGConnectingPoint num="2" id="1579" />
-<TGConnectingPoint num="3" id="1580" />
+<TGConnectingPoint num="0" id="1323" />
+<TGConnectingPoint num="1" id="1324" />
+<TGConnectingPoint num="2" id="1325" />
+<TGConnectingPoint num="3" id="1326" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3797,29 +3307,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="curr_Ks_a.Key = tmp3" enabled="true"/>
+<actions value="curr_K_a = pk(curr_Ks_a) " enabled="true"/>
+<actions value="DH_receiving = DH(curr_K_b, curr_Ks_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1590" >
-<cdparam x="357" y="1846" />
+<CONNECTOR type="5102" id="1336" >
+<cdparam x="190" y="2437" />
 <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="1589" />
-<P1  x="362" y="1836" id="1952" />
-<P2  x="280" y="1859" id="1866" />
+<TGConnectingPoint num="0" id="1335" />
+<P1  x="406" y="2108" id="1604" />
+<P2  x="406" y="2223" id="1558" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1588" >
-<father id="1590" num="0" />
-<cdparam x="353" y="1867" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1334" >
+<father id="1336" num="0" />
+<cdparam x="427" y="2128" />
+<sizeparam width="212" height="90" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1584" />
-<TGConnectingPoint num="1" id="1585" />
-<TGConnectingPoint num="2" id="1586" />
-<TGConnectingPoint num="3" id="1587" />
+<TGConnectingPoint num="0" id="1330" />
+<TGConnectingPoint num="1" id="1331" />
+<TGConnectingPoint num="2" id="1332" />
+<TGConnectingPoint num="3" id="1333" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3827,29 +3340,35 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="tmp1.Message = DH_sending.Key" enabled="true"/>
+<actions value="tmp2.Message = CK_receiving.Key" enabled="true"/>
+<actions value="tmp4 = concat2(tmp2, tmp1) " enabled="true"/>
+<actions value="tmp1 = hash(tmp4)" enabled="true"/>
+<actions value="CK_sending.Key = tmp1.Message" enabled="true"/>
+<actions value="RK.Key = CK_sending.Key" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1597" >
-<cdparam x="350" y="1919" />
+<CONNECTOR type="5102" id="1343" >
+<cdparam x="182" y="2577" />
 <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="1596" />
-<P1  x="280" y="1889" id="1867" />
-<P2  x="350" y="2011" id="1889" />
+<TGConnectingPoint num="0" id="1342" />
+<P1  x="406" y="2253" id="1563" />
+<P2  x="406" y="2324" id="1462" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1595" >
-<father id="1597" num="0" />
-<cdparam x="331" y="1924" />
-<sizeparam width="226" height="60" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1341" >
+<father id="1343" num="0" />
+<cdparam x="430" y="2276" />
+<sizeparam width="206" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1591" />
-<TGConnectingPoint num="1" id="1592" />
-<TGConnectingPoint num="2" id="1593" />
-<TGConnectingPoint num="3" id="1594" />
+<TGConnectingPoint num="0" id="1337" />
+<TGConnectingPoint num="1" id="1338" />
+<TGConnectingPoint num="2" id="1339" />
+<TGConnectingPoint num="3" id="1340" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3857,33 +3376,32 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="curr_Ks_b.Key = tmp3" enabled="true"/>
-<actions value="curr_K_b = pk(curr_Ks_b) " enabled="true"/>
-<actions value="tmp1.Message = curr_K_b.Key" enabled="true"/>
-<actions value="filler4 = concat3(tmp1, 2, b_cipher) " enabled="true"/>
+<actions value="tmp1.Message = CK_sending.Key" enabled="true"/>
+<actions value="tmp4 = hash(tmp1)" enabled="true"/>
+<actions value="CK_sending.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1604" >
-<cdparam x="275" y="2294" />
+<CONNECTOR type="5102" id="1350" >
+<cdparam x="247" y="3273" />
 <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="1603" />
-<P1  x="246" y="2256" id="1856" />
-<P2  x="196" y="2292" id="1841" />
+<TGConnectingPoint num="0" id="1349" />
+<P1  x="406" y="2354" id="1467" />
+<P2  x="406" y="2406" id="1421" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1602" >
-<father id="1604" num="0" />
-<cdparam x="284" y="2340" />
-<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1348" >
+<father id="1350" num="0" />
+<cdparam x="426" y="2378" />
+<sizeparam width="242" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1598" />
-<TGConnectingPoint num="1" id="1599" />
-<TGConnectingPoint num="2" id="1600" />
-<TGConnectingPoint num="3" id="1601" />
+<TGConnectingPoint num="0" id="1344" />
+<TGConnectingPoint num="1" id="1345" />
+<TGConnectingPoint num="2" id="1346" />
+<TGConnectingPoint num="3" id="1347" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3891,29 +3409,30 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
+<actions value="a2_cipher = sencrypt(a2, CK_sending) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1611" >
-<cdparam x="287" y="2490" />
+<CONNECTOR type="5102" id="1357" >
+<cdparam x="167" y="3554" />
 <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="1610" />
-<P1  x="250" y="2490" id="1806" />
-<P2  x="267" y="2581" id="1760" />
+<TGConnectingPoint num="0" id="1356" />
+<P1  x="406" y="2553" id="1385" />
+<P2  x="406" y="2576" id="1368" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1609" >
-<father id="1611" num="0" />
-<cdparam x="276" y="2529" />
-<sizeparam width="257" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1355" >
+<father id="1357" num="0" />
+<cdparam x="173" y="3585" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1605" />
-<TGConnectingPoint num="1" id="1606" />
-<TGConnectingPoint num="2" id="1607" />
-<TGConnectingPoint num="3" id="1608" />
+<TGConnectingPoint num="0" id="1351" />
+<TGConnectingPoint num="1" id="1352" />
+<TGConnectingPoint num="2" id="1353" />
+<TGConnectingPoint num="3" id="1354" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3921,30 +3440,29 @@
 <computeMin value="" enabled="true"/>
 <computeMax value="" enabled="true"/>
 <probability value="" enabled="true"/>
-<actions value="DH_receiving = DH(next_K_a , next_Ks_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
-<CONNECTOR type="5102" id="1618" >
-<cdparam x="246" y="3078" />
+<CONNECTOR type="5102" id="1364" >
+<cdparam x="180" y="3647" />
 <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="1617" />
-<P1  x="249" y="3292" id="1642" />
-<P2  x="229" y="3428" id="2301" />
+<TGConnectingPoint num="0" id="1363" />
+<P1  x="406" y="2606" id="1369" />
+<P2  x="405" y="2624" id="1683" />
 <AutomaticDrawing  data="true" />
-</CONNECTOR><SUBCOMPONENT type="-1" id="1616" >
-<father id="1618" num="0" />
-<cdparam x="245" y="3126" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="1362" >
+<father id="1364" num="0" />
+<cdparam x="175" y="3672" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="3500" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
-<TGConnectingPoint num="0" id="1612" />
-<TGConnectingPoint num="1" id="1613" />
-<TGConnectingPoint num="2" id="1614" />
-<TGConnectingPoint num="3" id="1615" />
+<TGConnectingPoint num="0" id="1358" />
+<TGConnectingPoint num="1" id="1359" />
+<TGConnectingPoint num="2" id="1360" />
+<TGConnectingPoint num="3" id="1361" />
 <extraparam>
 <guard value="[ ]" enabled="true"/>
 <afterMin value="" enabled="true"/>
@@ -3955,938 +3473,1420 @@
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="5108" id="1621" >
-<cdparam x="164" y="250" />
+<COMPONENT type="5108" id="1367" >
+<cdparam x="325" y="142" />
 <sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1619" />
-<TGConnectingPoint num="1" id="1620" />
+<TGConnectingPoint num="0" id="1365" />
+<TGConnectingPoint num="1" id="1366" />
 <extraparam>
 <Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="1624" >
-<cdparam x="231" y="95" />
+<COMPONENT type="5103" id="1378" >
+<cdparam x="361" y="2581" />
+<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="Send signal" value="chout(filler6)" />
+<TGConnectingPoint num="0" id="1368" />
+<TGConnectingPoint num="1" id="1369" />
+<TGConnectingPoint num="2" id="1370" />
+<TGConnectingPoint num="3" id="1371" />
+<TGConnectingPoint num="4" id="1372" />
+<TGConnectingPoint num="5" id="1373" />
+<TGConnectingPoint num="6" id="1374" />
+<TGConnectingPoint num="7" id="1375" />
+<TGConnectingPoint num="8" id="1376" />
+<TGConnectingPoint num="9" id="1377" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1419" >
+<cdparam x="314" y="2523" />
+<sizeparam width="185" height="30" 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="4000" />
+<infoparam name="State" value="Sending_Message_a2" />
+<TGConnectingPoint num="0" id="1379" />
+<TGConnectingPoint num="1" id="1380" />
+<TGConnectingPoint num="2" id="1381" />
+<TGConnectingPoint num="3" id="1382" />
+<TGConnectingPoint num="4" id="1383" />
+<TGConnectingPoint num="5" id="1384" />
+<TGConnectingPoint num="6" id="1385" />
+<TGConnectingPoint num="7" id="1386" />
+<TGConnectingPoint num="8" id="1387" />
+<TGConnectingPoint num="9" id="1388" />
+<TGConnectingPoint num="10" id="1389" />
+<TGConnectingPoint num="11" id="1390" />
+<TGConnectingPoint num="12" id="1391" />
+<TGConnectingPoint num="13" id="1392" />
+<TGConnectingPoint num="14" id="1393" />
+<TGConnectingPoint num="15" id="1394" />
+<TGConnectingPoint num="16" id="1395" />
+<TGConnectingPoint num="17" id="1396" />
+<TGConnectingPoint num="18" id="1397" />
+<TGConnectingPoint num="19" id="1398" />
+<TGConnectingPoint num="20" id="1399" />
+<TGConnectingPoint num="21" id="1400" />
+<TGConnectingPoint num="22" id="1401" />
+<TGConnectingPoint num="23" id="1402" />
+<TGConnectingPoint num="24" id="1403" />
+<TGConnectingPoint num="25" id="1404" />
+<TGConnectingPoint num="26" id="1405" />
+<TGConnectingPoint num="27" id="1406" />
+<TGConnectingPoint num="28" id="1407" />
+<TGConnectingPoint num="29" id="1408" />
+<TGConnectingPoint num="30" id="1409" />
+<TGConnectingPoint num="31" id="1410" />
+<TGConnectingPoint num="32" id="1411" />
+<TGConnectingPoint num="33" id="1412" />
+<TGConnectingPoint num="34" id="1413" />
+<TGConnectingPoint num="35" id="1414" />
+<TGConnectingPoint num="36" id="1415" />
+<TGConnectingPoint num="37" id="1416" />
+<TGConnectingPoint num="38" id="1417" />
+<TGConnectingPoint num="39" id="1418" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1460" >
+<cdparam x="356" y="2406" />
+<sizeparam width="100" height="30" 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="4000" />
+<infoparam name="State" value="Encryption_2" />
+<TGConnectingPoint num="0" id="1420" />
+<TGConnectingPoint num="1" id="1421" />
+<TGConnectingPoint num="2" id="1422" />
+<TGConnectingPoint num="3" id="1423" />
+<TGConnectingPoint num="4" id="1424" />
+<TGConnectingPoint num="5" id="1425" />
+<TGConnectingPoint num="6" id="1426" />
+<TGConnectingPoint num="7" id="1427" />
+<TGConnectingPoint num="8" id="1428" />
+<TGConnectingPoint num="9" id="1429" />
+<TGConnectingPoint num="10" id="1430" />
+<TGConnectingPoint num="11" id="1431" />
+<TGConnectingPoint num="12" id="1432" />
+<TGConnectingPoint num="13" id="1433" />
+<TGConnectingPoint num="14" id="1434" />
+<TGConnectingPoint num="15" id="1435" />
+<TGConnectingPoint num="16" id="1436" />
+<TGConnectingPoint num="17" id="1437" />
+<TGConnectingPoint num="18" id="1438" />
+<TGConnectingPoint num="19" id="1439" />
+<TGConnectingPoint num="20" id="1440" />
+<TGConnectingPoint num="21" id="1441" />
+<TGConnectingPoint num="22" id="1442" />
+<TGConnectingPoint num="23" id="1443" />
+<TGConnectingPoint num="24" id="1444" />
+<TGConnectingPoint num="25" id="1445" />
+<TGConnectingPoint num="26" id="1446" />
+<TGConnectingPoint num="27" id="1447" />
+<TGConnectingPoint num="28" id="1448" />
+<TGConnectingPoint num="29" id="1449" />
+<TGConnectingPoint num="30" id="1450" />
+<TGConnectingPoint num="31" id="1451" />
+<TGConnectingPoint num="32" id="1452" />
+<TGConnectingPoint num="33" id="1453" />
+<TGConnectingPoint num="34" id="1454" />
+<TGConnectingPoint num="35" id="1455" />
+<TGConnectingPoint num="36" id="1456" />
+<TGConnectingPoint num="37" id="1457" />
+<TGConnectingPoint num="38" id="1458" />
+<TGConnectingPoint num="39" id="1459" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1501" >
+<cdparam x="296" y="2324" />
+<sizeparam width="220" height="30" 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="4000" />
+<infoparam name="State" value="Sending_Message_Key_2" />
+<TGConnectingPoint num="0" id="1461" />
+<TGConnectingPoint num="1" id="1462" />
+<TGConnectingPoint num="2" id="1463" />
+<TGConnectingPoint num="3" id="1464" />
+<TGConnectingPoint num="4" id="1465" />
+<TGConnectingPoint num="5" id="1466" />
+<TGConnectingPoint num="6" id="1467" />
+<TGConnectingPoint num="7" id="1468" />
+<TGConnectingPoint num="8" id="1469" />
+<TGConnectingPoint num="9" id="1470" />
+<TGConnectingPoint num="10" id="1471" />
+<TGConnectingPoint num="11" id="1472" />
+<TGConnectingPoint num="12" id="1473" />
+<TGConnectingPoint num="13" id="1474" />
+<TGConnectingPoint num="14" id="1475" />
+<TGConnectingPoint num="15" id="1476" />
+<TGConnectingPoint num="16" id="1477" />
+<TGConnectingPoint num="17" id="1478" />
+<TGConnectingPoint num="18" id="1479" />
+<TGConnectingPoint num="19" id="1480" />
+<TGConnectingPoint num="20" id="1481" />
+<TGConnectingPoint num="21" id="1482" />
+<TGConnectingPoint num="22" id="1483" />
+<TGConnectingPoint num="23" id="1484" />
+<TGConnectingPoint num="24" id="1485" />
+<TGConnectingPoint num="25" id="1486" />
+<TGConnectingPoint num="26" id="1487" />
+<TGConnectingPoint num="27" id="1488" />
+<TGConnectingPoint num="28" id="1489" />
+<TGConnectingPoint num="29" id="1490" />
+<TGConnectingPoint num="30" id="1491" />
+<TGConnectingPoint num="31" id="1492" />
+<TGConnectingPoint num="32" id="1493" />
+<TGConnectingPoint num="33" id="1494" />
+<TGConnectingPoint num="34" id="1495" />
+<TGConnectingPoint num="35" id="1496" />
+<TGConnectingPoint num="36" id="1497" />
+<TGConnectingPoint num="37" id="1498" />
+<TGConnectingPoint num="38" id="1499" />
+<TGConnectingPoint num="39" id="1500" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1542" >
+<cdparam x="319" y="1865" />
+<sizeparam width="174" height="30" 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="4000" />
+<infoparam name="State" value="KDF_RK_receiving_2" />
+<TGConnectingPoint num="0" id="1502" />
+<TGConnectingPoint num="1" id="1503" />
+<TGConnectingPoint num="2" id="1504" />
+<TGConnectingPoint num="3" id="1505" />
+<TGConnectingPoint num="4" id="1506" />
+<TGConnectingPoint num="5" id="1507" />
+<TGConnectingPoint num="6" id="1508" />
+<TGConnectingPoint num="7" id="1509" />
+<TGConnectingPoint num="8" id="1510" />
+<TGConnectingPoint num="9" id="1511" />
+<TGConnectingPoint num="10" id="1512" />
+<TGConnectingPoint num="11" id="1513" />
+<TGConnectingPoint num="12" id="1514" />
+<TGConnectingPoint num="13" id="1515" />
+<TGConnectingPoint num="14" id="1516" />
+<TGConnectingPoint num="15" id="1517" />
+<TGConnectingPoint num="16" id="1518" />
+<TGConnectingPoint num="17" id="1519" />
+<TGConnectingPoint num="18" id="1520" />
+<TGConnectingPoint num="19" id="1521" />
+<TGConnectingPoint num="20" id="1522" />
+<TGConnectingPoint num="21" id="1523" />
+<TGConnectingPoint num="22" id="1524" />
+<TGConnectingPoint num="23" id="1525" />
+<TGConnectingPoint num="24" id="1526" />
+<TGConnectingPoint num="25" id="1527" />
+<TGConnectingPoint num="26" id="1528" />
+<TGConnectingPoint num="27" id="1529" />
+<TGConnectingPoint num="28" id="1530" />
+<TGConnectingPoint num="29" id="1531" />
+<TGConnectingPoint num="30" id="1532" />
+<TGConnectingPoint num="31" id="1533" />
+<TGConnectingPoint num="32" id="1534" />
+<TGConnectingPoint num="33" id="1535" />
+<TGConnectingPoint num="34" id="1536" />
+<TGConnectingPoint num="35" id="1537" />
+<TGConnectingPoint num="36" id="1538" />
+<TGConnectingPoint num="37" id="1539" />
+<TGConnectingPoint num="38" id="1540" />
+<TGConnectingPoint num="39" id="1541" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5108" id="1545" >
+<cdparam x="325" y="1992" />
 <sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
 <infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1622" />
-<TGConnectingPoint num="1" id="1623" />
+<TGConnectingPoint num="0" id="1543" />
+<TGConnectingPoint num="1" id="1544" />
 <extraparam>
 <Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1635" >
-<cdparam x="221" y="364" />
+<COMPONENT type="5104" id="1556" >
+<cdparam x="362" y="1927" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="Receive signal" value="chin(filler5)" />
+<TGConnectingPoint num="0" id="1546" />
+<TGConnectingPoint num="1" id="1547" />
+<TGConnectingPoint num="2" id="1548" />
+<TGConnectingPoint num="3" id="1549" />
+<TGConnectingPoint num="4" id="1550" />
+<TGConnectingPoint num="5" id="1551" />
+<TGConnectingPoint num="6" id="1552" />
+<TGConnectingPoint num="7" id="1553" />
+<TGConnectingPoint num="8" id="1554" />
+<TGConnectingPoint num="9" id="1555" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1597" >
+<cdparam x="320" y="2223" />
+<sizeparam width="172" height="30" 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="4000" />
+<infoparam name="State" value="KDF_RK_sending_2" />
+<TGConnectingPoint num="0" id="1557" />
+<TGConnectingPoint num="1" id="1558" />
+<TGConnectingPoint num="2" id="1559" />
+<TGConnectingPoint num="3" id="1560" />
+<TGConnectingPoint num="4" id="1561" />
+<TGConnectingPoint num="5" id="1562" />
+<TGConnectingPoint num="6" id="1563" />
+<TGConnectingPoint num="7" id="1564" />
+<TGConnectingPoint num="8" id="1565" />
+<TGConnectingPoint num="9" id="1566" />
+<TGConnectingPoint num="10" id="1567" />
+<TGConnectingPoint num="11" id="1568" />
+<TGConnectingPoint num="12" id="1569" />
+<TGConnectingPoint num="13" id="1570" />
+<TGConnectingPoint num="14" id="1571" />
+<TGConnectingPoint num="15" id="1572" />
+<TGConnectingPoint num="16" id="1573" />
+<TGConnectingPoint num="17" id="1574" />
+<TGConnectingPoint num="18" id="1575" />
+<TGConnectingPoint num="19" id="1576" />
+<TGConnectingPoint num="20" id="1577" />
+<TGConnectingPoint num="21" id="1578" />
+<TGConnectingPoint num="22" id="1579" />
+<TGConnectingPoint num="23" id="1580" />
+<TGConnectingPoint num="24" id="1581" />
+<TGConnectingPoint num="25" id="1582" />
+<TGConnectingPoint num="26" id="1583" />
+<TGConnectingPoint num="27" id="1584" />
+<TGConnectingPoint num="28" id="1585" />
+<TGConnectingPoint num="29" id="1586" />
+<TGConnectingPoint num="30" id="1587" />
+<TGConnectingPoint num="31" id="1588" />
+<TGConnectingPoint num="32" id="1589" />
+<TGConnectingPoint num="33" id="1590" />
+<TGConnectingPoint num="34" id="1591" />
+<TGConnectingPoint num="35" id="1592" />
+<TGConnectingPoint num="36" id="1593" />
+<TGConnectingPoint num="37" id="1594" />
+<TGConnectingPoint num="38" id="1595" />
+<TGConnectingPoint num="39" id="1596" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1638" >
+<cdparam x="337" y="2078" />
+<sizeparam width="138" height="30" 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="4000" />
+<infoparam name="State" value="DH_sending_2" />
+<TGConnectingPoint num="0" id="1598" />
+<TGConnectingPoint num="1" id="1599" />
+<TGConnectingPoint num="2" id="1600" />
+<TGConnectingPoint num="3" id="1601" />
+<TGConnectingPoint num="4" id="1602" />
+<TGConnectingPoint num="5" id="1603" />
+<TGConnectingPoint num="6" id="1604" />
+<TGConnectingPoint num="7" id="1605" />
+<TGConnectingPoint num="8" id="1606" />
+<TGConnectingPoint num="9" id="1607" />
+<TGConnectingPoint num="10" id="1608" />
+<TGConnectingPoint num="11" id="1609" />
+<TGConnectingPoint num="12" id="1610" />
+<TGConnectingPoint num="13" id="1611" />
+<TGConnectingPoint num="14" id="1612" />
+<TGConnectingPoint num="15" id="1613" />
+<TGConnectingPoint num="16" id="1614" />
+<TGConnectingPoint num="17" id="1615" />
+<TGConnectingPoint num="18" id="1616" />
+<TGConnectingPoint num="19" id="1617" />
+<TGConnectingPoint num="20" id="1618" />
+<TGConnectingPoint num="21" id="1619" />
+<TGConnectingPoint num="22" id="1620" />
+<TGConnectingPoint num="23" id="1621" />
+<TGConnectingPoint num="24" id="1622" />
+<TGConnectingPoint num="25" id="1623" />
+<TGConnectingPoint num="26" id="1624" />
+<TGConnectingPoint num="27" id="1625" />
+<TGConnectingPoint num="28" id="1626" />
+<TGConnectingPoint num="29" id="1627" />
+<TGConnectingPoint num="30" id="1628" />
+<TGConnectingPoint num="31" id="1629" />
+<TGConnectingPoint num="32" id="1630" />
+<TGConnectingPoint num="33" id="1631" />
+<TGConnectingPoint num="34" id="1632" />
+<TGConnectingPoint num="35" id="1633" />
+<TGConnectingPoint num="36" id="1634" />
+<TGConnectingPoint num="37" id="1635" />
+<TGConnectingPoint num="38" id="1636" />
+<TGConnectingPoint num="39" id="1637" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5108" id="1641" >
+<cdparam x="325" y="1633" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="1639" />
+<TGConnectingPoint num="1" id="1640" />
+<extraparam>
+<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1682" >
+<cdparam x="333" y="1725" />
+<sizeparam width="146" height="30" 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="4000" />
+<infoparam name="State" value="DH_Receiving_2" />
+<TGConnectingPoint num="0" id="1642" />
+<TGConnectingPoint num="1" id="1643" />
+<TGConnectingPoint num="2" id="1644" />
+<TGConnectingPoint num="3" id="1645" />
+<TGConnectingPoint num="4" id="1646" />
+<TGConnectingPoint num="5" id="1647" />
+<TGConnectingPoint num="6" id="1648" />
+<TGConnectingPoint num="7" id="1649" />
+<TGConnectingPoint num="8" id="1650" />
+<TGConnectingPoint num="9" id="1651" />
+<TGConnectingPoint num="10" id="1652" />
+<TGConnectingPoint num="11" id="1653" />
+<TGConnectingPoint num="12" id="1654" />
+<TGConnectingPoint num="13" id="1655" />
+<TGConnectingPoint num="14" id="1656" />
+<TGConnectingPoint num="15" id="1657" />
+<TGConnectingPoint num="16" id="1658" />
+<TGConnectingPoint num="17" id="1659" />
+<TGConnectingPoint num="18" id="1660" />
+<TGConnectingPoint num="19" id="1661" />
+<TGConnectingPoint num="20" id="1662" />
+<TGConnectingPoint num="21" id="1663" />
+<TGConnectingPoint num="22" id="1664" />
+<TGConnectingPoint num="23" id="1665" />
+<TGConnectingPoint num="24" id="1666" />
+<TGConnectingPoint num="25" id="1667" />
+<TGConnectingPoint num="26" id="1668" />
+<TGConnectingPoint num="27" id="1669" />
+<TGConnectingPoint num="28" id="1670" />
+<TGConnectingPoint num="29" id="1671" />
+<TGConnectingPoint num="30" id="1672" />
+<TGConnectingPoint num="31" id="1673" />
+<TGConnectingPoint num="32" id="1674" />
+<TGConnectingPoint num="33" id="1675" />
+<TGConnectingPoint num="34" id="1676" />
+<TGConnectingPoint num="35" id="1677" />
+<TGConnectingPoint num="36" id="1678" />
+<TGConnectingPoint num="37" id="1679" />
+<TGConnectingPoint num="38" id="1680" />
+<TGConnectingPoint num="39" id="1681" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5101" id="1684" >
+<cdparam x="395" y="2629" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="1683" />
+</COMPONENT>
+
+<COMPONENT type="5106" id="1725" >
+<cdparam x="353" y="1570" />
+<sizeparam width="106" height="30" 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="4000" />
+<infoparam name="State" value="Decryption" />
+<TGConnectingPoint num="0" id="1685" />
+<TGConnectingPoint num="1" id="1686" />
+<TGConnectingPoint num="2" id="1687" />
+<TGConnectingPoint num="3" id="1688" />
+<TGConnectingPoint num="4" id="1689" />
+<TGConnectingPoint num="5" id="1690" />
+<TGConnectingPoint num="6" id="1691" />
+<TGConnectingPoint num="7" id="1692" />
+<TGConnectingPoint num="8" id="1693" />
+<TGConnectingPoint num="9" id="1694" />
+<TGConnectingPoint num="10" id="1695" />
+<TGConnectingPoint num="11" id="1696" />
+<TGConnectingPoint num="12" id="1697" />
+<TGConnectingPoint num="13" id="1698" />
+<TGConnectingPoint num="14" id="1699" />
+<TGConnectingPoint num="15" id="1700" />
+<TGConnectingPoint num="16" id="1701" />
+<TGConnectingPoint num="17" id="1702" />
+<TGConnectingPoint num="18" id="1703" />
+<TGConnectingPoint num="19" id="1704" />
+<TGConnectingPoint num="20" id="1705" />
+<TGConnectingPoint num="21" id="1706" />
+<TGConnectingPoint num="22" id="1707" />
+<TGConnectingPoint num="23" id="1708" />
+<TGConnectingPoint num="24" id="1709" />
+<TGConnectingPoint num="25" id="1710" />
+<TGConnectingPoint num="26" id="1711" />
+<TGConnectingPoint num="27" id="1712" />
+<TGConnectingPoint num="28" id="1713" />
+<TGConnectingPoint num="29" id="1714" />
+<TGConnectingPoint num="30" id="1715" />
+<TGConnectingPoint num="31" id="1716" />
+<TGConnectingPoint num="32" id="1717" />
+<TGConnectingPoint num="33" id="1718" />
+<TGConnectingPoint num="34" id="1719" />
+<TGConnectingPoint num="35" id="1720" />
+<TGConnectingPoint num="36" id="1721" />
+<TGConnectingPoint num="37" id="1722" />
+<TGConnectingPoint num="38" id="1723" />
+<TGConnectingPoint num="39" id="1724" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5106" id="1766" >
+<cdparam x="313" y="1482" />
+<sizeparam width="187" height="30" 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="4000" />
+<infoparam name="State" value="Receiving_message_b" />
+<TGConnectingPoint num="0" id="1726" />
+<TGConnectingPoint num="1" id="1727" />
+<TGConnectingPoint num="2" id="1728" />
+<TGConnectingPoint num="3" id="1729" />
+<TGConnectingPoint num="4" id="1730" />
+<TGConnectingPoint num="5" id="1731" />
+<TGConnectingPoint num="6" id="1732" />
+<TGConnectingPoint num="7" id="1733" />
+<TGConnectingPoint num="8" id="1734" />
+<TGConnectingPoint num="9" id="1735" />
+<TGConnectingPoint num="10" id="1736" />
+<TGConnectingPoint num="11" id="1737" />
+<TGConnectingPoint num="12" id="1738" />
+<TGConnectingPoint num="13" id="1739" />
+<TGConnectingPoint num="14" id="1740" />
+<TGConnectingPoint num="15" id="1741" />
+<TGConnectingPoint num="16" id="1742" />
+<TGConnectingPoint num="17" id="1743" />
+<TGConnectingPoint num="18" id="1744" />
+<TGConnectingPoint num="19" id="1745" />
+<TGConnectingPoint num="20" id="1746" />
+<TGConnectingPoint num="21" id="1747" />
+<TGConnectingPoint num="22" id="1748" />
+<TGConnectingPoint num="23" id="1749" />
+<TGConnectingPoint num="24" id="1750" />
+<TGConnectingPoint num="25" id="1751" />
+<TGConnectingPoint num="26" id="1752" />
+<TGConnectingPoint num="27" id="1753" />
+<TGConnectingPoint num="28" id="1754" />
+<TGConnectingPoint num="29" id="1755" />
+<TGConnectingPoint num="30" id="1756" />
+<TGConnectingPoint num="31" id="1757" />
+<TGConnectingPoint num="32" id="1758" />
+<TGConnectingPoint num="33" id="1759" />
+<TGConnectingPoint num="34" id="1760" />
+<TGConnectingPoint num="35" id="1761" />
+<TGConnectingPoint num="36" id="1762" />
+<TGConnectingPoint num="37" id="1763" />
+<TGConnectingPoint num="38" id="1764" />
+<TGConnectingPoint num="39" id="1765" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5104" id="1777" >
+<cdparam x="362" y="1401" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<infoparam name="Receive signal" value="chin(filler4)" />
+<TGConnectingPoint num="0" id="1767" />
+<TGConnectingPoint num="1" id="1768" />
+<TGConnectingPoint num="2" id="1769" />
+<TGConnectingPoint num="3" id="1770" />
+<TGConnectingPoint num="4" id="1771" />
+<TGConnectingPoint num="5" id="1772" />
+<TGConnectingPoint num="6" id="1773" />
+<TGConnectingPoint num="7" id="1774" />
+<TGConnectingPoint num="8" id="1775" />
+<TGConnectingPoint num="9" id="1776" />
+</COMPONENT>
+
+<COMPONENT type="5103" id="1788" >
+<cdparam x="361" y="1348" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(filler2)" />
-<TGConnectingPoint num="0" id="1625" />
-<TGConnectingPoint num="1" id="1626" />
-<TGConnectingPoint num="2" id="1627" />
-<TGConnectingPoint num="3" id="1628" />
-<TGConnectingPoint num="4" id="1629" />
-<TGConnectingPoint num="5" id="1630" />
-<TGConnectingPoint num="6" id="1631" />
-<TGConnectingPoint num="7" id="1632" />
-<TGConnectingPoint num="8" id="1633" />
-<TGConnectingPoint num="9" id="1634" />
+<infoparam name="Send signal" value="chout(filler3)" />
+<TGConnectingPoint num="0" id="1778" />
+<TGConnectingPoint num="1" id="1779" />
+<TGConnectingPoint num="2" id="1780" />
+<TGConnectingPoint num="3" id="1781" />
+<TGConnectingPoint num="4" id="1782" />
+<TGConnectingPoint num="5" id="1783" />
+<TGConnectingPoint num="6" id="1784" />
+<TGConnectingPoint num="7" id="1785" />
+<TGConnectingPoint num="8" id="1786" />
+<TGConnectingPoint num="9" id="1787" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1676" >
-<cdparam x="173" y="3242" />
-<sizeparam width="153" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1829" >
+<cdparam x="316" y="1283" />
+<sizeparam width="180" height="30" 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="4000" />
-<infoparam name="State" value="Decryption_2" />
-<TGConnectingPoint num="0" id="1636" />
-<TGConnectingPoint num="1" id="1637" />
-<TGConnectingPoint num="2" id="1638" />
-<TGConnectingPoint num="3" id="1639" />
-<TGConnectingPoint num="4" id="1640" />
-<TGConnectingPoint num="5" id="1641" />
-<TGConnectingPoint num="6" id="1642" />
-<TGConnectingPoint num="7" id="1643" />
-<TGConnectingPoint num="8" id="1644" />
-<TGConnectingPoint num="9" id="1645" />
-<TGConnectingPoint num="10" id="1646" />
-<TGConnectingPoint num="11" id="1647" />
-<TGConnectingPoint num="12" id="1648" />
-<TGConnectingPoint num="13" id="1649" />
-<TGConnectingPoint num="14" id="1650" />
-<TGConnectingPoint num="15" id="1651" />
-<TGConnectingPoint num="16" id="1652" />
-<TGConnectingPoint num="17" id="1653" />
-<TGConnectingPoint num="18" id="1654" />
-<TGConnectingPoint num="19" id="1655" />
-<TGConnectingPoint num="20" id="1656" />
-<TGConnectingPoint num="21" id="1657" />
-<TGConnectingPoint num="22" id="1658" />
-<TGConnectingPoint num="23" id="1659" />
-<TGConnectingPoint num="24" id="1660" />
-<TGConnectingPoint num="25" id="1661" />
-<TGConnectingPoint num="26" id="1662" />
-<TGConnectingPoint num="27" id="1663" />
-<TGConnectingPoint num="28" id="1664" />
-<TGConnectingPoint num="29" id="1665" />
-<TGConnectingPoint num="30" id="1666" />
-<TGConnectingPoint num="31" id="1667" />
-<TGConnectingPoint num="32" id="1668" />
-<TGConnectingPoint num="33" id="1669" />
-<TGConnectingPoint num="34" id="1670" />
-<TGConnectingPoint num="35" id="1671" />
-<TGConnectingPoint num="36" id="1672" />
-<TGConnectingPoint num="37" id="1673" />
-<TGConnectingPoint num="38" id="1674" />
-<TGConnectingPoint num="39" id="1675" />
+<infoparam name="State" value="Sending_message_a" />
+<TGConnectingPoint num="0" id="1789" />
+<TGConnectingPoint num="1" id="1790" />
+<TGConnectingPoint num="2" id="1791" />
+<TGConnectingPoint num="3" id="1792" />
+<TGConnectingPoint num="4" id="1793" />
+<TGConnectingPoint num="5" id="1794" />
+<TGConnectingPoint num="6" id="1795" />
+<TGConnectingPoint num="7" id="1796" />
+<TGConnectingPoint num="8" id="1797" />
+<TGConnectingPoint num="9" id="1798" />
+<TGConnectingPoint num="10" id="1799" />
+<TGConnectingPoint num="11" id="1800" />
+<TGConnectingPoint num="12" id="1801" />
+<TGConnectingPoint num="13" id="1802" />
+<TGConnectingPoint num="14" id="1803" />
+<TGConnectingPoint num="15" id="1804" />
+<TGConnectingPoint num="16" id="1805" />
+<TGConnectingPoint num="17" id="1806" />
+<TGConnectingPoint num="18" id="1807" />
+<TGConnectingPoint num="19" id="1808" />
+<TGConnectingPoint num="20" id="1809" />
+<TGConnectingPoint num="21" id="1810" />
+<TGConnectingPoint num="22" id="1811" />
+<TGConnectingPoint num="23" id="1812" />
+<TGConnectingPoint num="24" id="1813" />
+<TGConnectingPoint num="25" id="1814" />
+<TGConnectingPoint num="26" id="1815" />
+<TGConnectingPoint num="27" id="1816" />
+<TGConnectingPoint num="28" id="1817" />
+<TGConnectingPoint num="29" id="1818" />
+<TGConnectingPoint num="30" id="1819" />
+<TGConnectingPoint num="31" id="1820" />
+<TGConnectingPoint num="32" id="1821" />
+<TGConnectingPoint num="33" id="1822" />
+<TGConnectingPoint num="34" id="1823" />
+<TGConnectingPoint num="35" id="1824" />
+<TGConnectingPoint num="36" id="1825" />
+<TGConnectingPoint num="37" id="1826" />
+<TGConnectingPoint num="38" id="1827" />
+<TGConnectingPoint num="39" id="1828" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1717" >
-<cdparam x="79" y="3070" />
-<sizeparam width="374" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1870" >
+<cdparam x="352" y="1154" />
+<sizeparam width="108" height="30" 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="4000" />
+<infoparam name="State" value="Encryption" />
+<TGConnectingPoint num="0" id="1830" />
+<TGConnectingPoint num="1" id="1831" />
+<TGConnectingPoint num="2" id="1832" />
+<TGConnectingPoint num="3" id="1833" />
+<TGConnectingPoint num="4" id="1834" />
+<TGConnectingPoint num="5" id="1835" />
+<TGConnectingPoint num="6" id="1836" />
+<TGConnectingPoint num="7" id="1837" />
+<TGConnectingPoint num="8" id="1838" />
+<TGConnectingPoint num="9" id="1839" />
+<TGConnectingPoint num="10" id="1840" />
+<TGConnectingPoint num="11" id="1841" />
+<TGConnectingPoint num="12" id="1842" />
+<TGConnectingPoint num="13" id="1843" />
+<TGConnectingPoint num="14" id="1844" />
+<TGConnectingPoint num="15" id="1845" />
+<TGConnectingPoint num="16" id="1846" />
+<TGConnectingPoint num="17" id="1847" />
+<TGConnectingPoint num="18" id="1848" />
+<TGConnectingPoint num="19" id="1849" />
+<TGConnectingPoint num="20" id="1850" />
+<TGConnectingPoint num="21" id="1851" />
+<TGConnectingPoint num="22" id="1852" />
+<TGConnectingPoint num="23" id="1853" />
+<TGConnectingPoint num="24" id="1854" />
+<TGConnectingPoint num="25" id="1855" />
+<TGConnectingPoint num="26" id="1856" />
+<TGConnectingPoint num="27" id="1857" />
+<TGConnectingPoint num="28" id="1858" />
+<TGConnectingPoint num="29" id="1859" />
+<TGConnectingPoint num="30" id="1860" />
+<TGConnectingPoint num="31" id="1861" />
+<TGConnectingPoint num="32" id="1862" />
+<TGConnectingPoint num="33" id="1863" />
+<TGConnectingPoint num="34" id="1864" />
+<TGConnectingPoint num="35" id="1865" />
+<TGConnectingPoint num="36" id="1866" />
+<TGConnectingPoint num="37" id="1867" />
+<TGConnectingPoint num="38" id="1868" />
+<TGConnectingPoint num="39" id="1869" />
+<extraparam>
+</extraparam>
+</COMPONENT>
+
+<COMPONENT type="5108" id="1873" >
+<cdparam x="325" y="602" />
+<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Receiving_Message_Key_2" />
-<TGConnectingPoint num="0" id="1677" />
-<TGConnectingPoint num="1" id="1678" />
-<TGConnectingPoint num="2" id="1679" />
-<TGConnectingPoint num="3" id="1680" />
-<TGConnectingPoint num="4" id="1681" />
-<TGConnectingPoint num="5" id="1682" />
-<TGConnectingPoint num="6" id="1683" />
-<TGConnectingPoint num="7" id="1684" />
-<TGConnectingPoint num="8" id="1685" />
-<TGConnectingPoint num="9" id="1686" />
-<TGConnectingPoint num="10" id="1687" />
-<TGConnectingPoint num="11" id="1688" />
-<TGConnectingPoint num="12" id="1689" />
-<TGConnectingPoint num="13" id="1690" />
-<TGConnectingPoint num="14" id="1691" />
-<TGConnectingPoint num="15" id="1692" />
-<TGConnectingPoint num="16" id="1693" />
-<TGConnectingPoint num="17" id="1694" />
-<TGConnectingPoint num="18" id="1695" />
-<TGConnectingPoint num="19" id="1696" />
-<TGConnectingPoint num="20" id="1697" />
-<TGConnectingPoint num="21" id="1698" />
-<TGConnectingPoint num="22" id="1699" />
-<TGConnectingPoint num="23" id="1700" />
-<TGConnectingPoint num="24" id="1701" />
-<TGConnectingPoint num="25" id="1702" />
-<TGConnectingPoint num="26" id="1703" />
-<TGConnectingPoint num="27" id="1704" />
-<TGConnectingPoint num="28" id="1705" />
-<TGConnectingPoint num="29" id="1706" />
-<TGConnectingPoint num="30" id="1707" />
-<TGConnectingPoint num="31" id="1708" />
-<TGConnectingPoint num="32" id="1709" />
-<TGConnectingPoint num="33" id="1710" />
-<TGConnectingPoint num="34" id="1711" />
-<TGConnectingPoint num="35" id="1712" />
-<TGConnectingPoint num="36" id="1713" />
-<TGConnectingPoint num="37" id="1714" />
-<TGConnectingPoint num="38" id="1715" />
-<TGConnectingPoint num="39" id="1716" />
+<infoparam name="TGComponent" value="null" />
+<TGConnectingPoint num="0" id="1871" />
+<TGConnectingPoint num="1" id="1872" />
 <extraparam>
+<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1758" >
-<cdparam x="72" y="2776" />
-<sizeparam width="294" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="1884" >
+<cdparam x="362" y="534" />
+<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="KDF_RK_receiving_2" />
-<TGConnectingPoint num="0" id="1718" />
-<TGConnectingPoint num="1" id="1719" />
-<TGConnectingPoint num="2" id="1720" />
-<TGConnectingPoint num="3" id="1721" />
-<TGConnectingPoint num="4" id="1722" />
-<TGConnectingPoint num="5" id="1723" />
-<TGConnectingPoint num="6" id="1724" />
-<TGConnectingPoint num="7" id="1725" />
-<TGConnectingPoint num="8" id="1726" />
-<TGConnectingPoint num="9" id="1727" />
-<TGConnectingPoint num="10" id="1728" />
-<TGConnectingPoint num="11" id="1729" />
-<TGConnectingPoint num="12" id="1730" />
-<TGConnectingPoint num="13" id="1731" />
-<TGConnectingPoint num="14" id="1732" />
-<TGConnectingPoint num="15" id="1733" />
-<TGConnectingPoint num="16" id="1734" />
-<TGConnectingPoint num="17" id="1735" />
-<TGConnectingPoint num="18" id="1736" />
-<TGConnectingPoint num="19" id="1737" />
-<TGConnectingPoint num="20" id="1738" />
-<TGConnectingPoint num="21" id="1739" />
-<TGConnectingPoint num="22" id="1740" />
-<TGConnectingPoint num="23" id="1741" />
-<TGConnectingPoint num="24" id="1742" />
-<TGConnectingPoint num="25" id="1743" />
-<TGConnectingPoint num="26" id="1744" />
-<TGConnectingPoint num="27" id="1745" />
-<TGConnectingPoint num="28" id="1746" />
-<TGConnectingPoint num="29" id="1747" />
-<TGConnectingPoint num="30" id="1748" />
-<TGConnectingPoint num="31" id="1749" />
-<TGConnectingPoint num="32" id="1750" />
-<TGConnectingPoint num="33" id="1751" />
-<TGConnectingPoint num="34" id="1752" />
-<TGConnectingPoint num="35" id="1753" />
-<TGConnectingPoint num="36" id="1754" />
-<TGConnectingPoint num="37" id="1755" />
-<TGConnectingPoint num="38" id="1756" />
-<TGConnectingPoint num="39" id="1757" />
-<extraparam>
-</extraparam>
+<infoparam name="Receive signal" value="chin(filler2)" />
+<TGConnectingPoint num="0" id="1874" />
+<TGConnectingPoint num="1" id="1875" />
+<TGConnectingPoint num="2" id="1876" />
+<TGConnectingPoint num="3" id="1877" />
+<TGConnectingPoint num="4" id="1878" />
+<TGConnectingPoint num="5" id="1879" />
+<TGConnectingPoint num="6" id="1880" />
+<TGConnectingPoint num="7" id="1881" />
+<TGConnectingPoint num="8" id="1882" />
+<TGConnectingPoint num="9" id="1883" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1799" >
-<cdparam x="142" y="2581" />
-<sizeparam width="250" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1925" >
+<cdparam x="279" y="1064" />
+<sizeparam width="254" height="30" 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="4000" />
-<infoparam name="State" value="DH_receiving_2" />
-<TGConnectingPoint num="0" id="1759" />
-<TGConnectingPoint num="1" id="1760" />
-<TGConnectingPoint num="2" id="1761" />
-<TGConnectingPoint num="3" id="1762" />
-<TGConnectingPoint num="4" id="1763" />
-<TGConnectingPoint num="5" id="1764" />
-<TGConnectingPoint num="6" id="1765" />
-<TGConnectingPoint num="7" id="1766" />
-<TGConnectingPoint num="8" id="1767" />
-<TGConnectingPoint num="9" id="1768" />
-<TGConnectingPoint num="10" id="1769" />
-<TGConnectingPoint num="11" id="1770" />
-<TGConnectingPoint num="12" id="1771" />
-<TGConnectingPoint num="13" id="1772" />
-<TGConnectingPoint num="14" id="1773" />
-<TGConnectingPoint num="15" id="1774" />
-<TGConnectingPoint num="16" id="1775" />
-<TGConnectingPoint num="17" id="1776" />
-<TGConnectingPoint num="18" id="1777" />
-<TGConnectingPoint num="19" id="1778" />
-<TGConnectingPoint num="20" id="1779" />
-<TGConnectingPoint num="21" id="1780" />
-<TGConnectingPoint num="22" id="1781" />
-<TGConnectingPoint num="23" id="1782" />
-<TGConnectingPoint num="24" id="1783" />
-<TGConnectingPoint num="25" id="1784" />
-<TGConnectingPoint num="26" id="1785" />
-<TGConnectingPoint num="27" id="1786" />
-<TGConnectingPoint num="28" id="1787" />
-<TGConnectingPoint num="29" id="1788" />
-<TGConnectingPoint num="30" id="1789" />
-<TGConnectingPoint num="31" id="1790" />
-<TGConnectingPoint num="32" id="1791" />
-<TGConnectingPoint num="33" id="1792" />
-<TGConnectingPoint num="34" id="1793" />
-<TGConnectingPoint num="35" id="1794" />
-<TGConnectingPoint num="36" id="1795" />
-<TGConnectingPoint num="37" id="1796" />
-<TGConnectingPoint num="38" id="1797" />
-<TGConnectingPoint num="39" id="1798" />
+<infoparam name="State" value="calculate_sending_message_Key" />
+<TGConnectingPoint num="0" id="1885" />
+<TGConnectingPoint num="1" id="1886" />
+<TGConnectingPoint num="2" id="1887" />
+<TGConnectingPoint num="3" id="1888" />
+<TGConnectingPoint num="4" id="1889" />
+<TGConnectingPoint num="5" id="1890" />
+<TGConnectingPoint num="6" id="1891" />
+<TGConnectingPoint num="7" id="1892" />
+<TGConnectingPoint num="8" id="1893" />
+<TGConnectingPoint num="9" id="1894" />
+<TGConnectingPoint num="10" id="1895" />
+<TGConnectingPoint num="11" id="1896" />
+<TGConnectingPoint num="12" id="1897" />
+<TGConnectingPoint num="13" id="1898" />
+<TGConnectingPoint num="14" id="1899" />
+<TGConnectingPoint num="15" id="1900" />
+<TGConnectingPoint num="16" id="1901" />
+<TGConnectingPoint num="17" id="1902" />
+<TGConnectingPoint num="18" id="1903" />
+<TGConnectingPoint num="19" id="1904" />
+<TGConnectingPoint num="20" id="1905" />
+<TGConnectingPoint num="21" id="1906" />
+<TGConnectingPoint num="22" id="1907" />
+<TGConnectingPoint num="23" id="1908" />
+<TGConnectingPoint num="24" id="1909" />
+<TGConnectingPoint num="25" id="1910" />
+<TGConnectingPoint num="26" id="1911" />
+<TGConnectingPoint num="27" id="1912" />
+<TGConnectingPoint num="28" id="1913" />
+<TGConnectingPoint num="29" id="1914" />
+<TGConnectingPoint num="30" id="1915" />
+<TGConnectingPoint num="31" id="1916" />
+<TGConnectingPoint num="32" id="1917" />
+<TGConnectingPoint num="33" id="1918" />
+<TGConnectingPoint num="34" id="1919" />
+<TGConnectingPoint num="35" id="1920" />
+<TGConnectingPoint num="36" id="1921" />
+<TGConnectingPoint num="37" id="1922" />
+<TGConnectingPoint num="38" id="1923" />
+<TGConnectingPoint num="39" id="1924" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5106" id="1840" >
-<cdparam x="200" y="2440" />
-<sizeparam width="100" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="1966" >
+<cdparam x="266" y="931" />
+<sizeparam width="281" height="30" 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="4000" />
-<infoparam name="State" value="Receiving_a2" />
-<TGConnectingPoint num="0" id="1800" />
-<TGConnectingPoint num="1" id="1801" />
-<TGConnectingPoint num="2" id="1802" />
-<TGConnectingPoint num="3" id="1803" />
-<TGConnectingPoint num="4" id="1804" />
-<TGConnectingPoint num="5" id="1805" />
-<TGConnectingPoint num="6" id="1806" />
-<TGConnectingPoint num="7" id="1807" />
-<TGConnectingPoint num="8" id="1808" />
-<TGConnectingPoint num="9" id="1809" />
-<TGConnectingPoint num="10" id="1810" />
-<TGConnectingPoint num="11" id="1811" />
-<TGConnectingPoint num="12" id="1812" />
-<TGConnectingPoint num="13" id="1813" />
-<TGConnectingPoint num="14" id="1814" />
-<TGConnectingPoint num="15" id="1815" />
-<TGConnectingPoint num="16" id="1816" />
-<TGConnectingPoint num="17" id="1817" />
-<TGConnectingPoint num="18" id="1818" />
-<TGConnectingPoint num="19" id="1819" />
-<TGConnectingPoint num="20" id="1820" />
-<TGConnectingPoint num="21" id="1821" />
-<TGConnectingPoint num="22" id="1822" />
-<TGConnectingPoint num="23" id="1823" />
-<TGConnectingPoint num="24" id="1824" />
-<TGConnectingPoint num="25" id="1825" />
-<TGConnectingPoint num="26" id="1826" />
-<TGConnectingPoint num="27" id="1827" />
-<TGConnectingPoint num="28" id="1828" />
-<TGConnectingPoint num="29" id="1829" />
-<TGConnectingPoint num="30" id="1830" />
-<TGConnectingPoint num="31" id="1831" />
-<TGConnectingPoint num="32" id="1832" />
-<TGConnectingPoint num="33" id="1833" />
-<TGConnectingPoint num="34" id="1834" />
-<TGConnectingPoint num="35" id="1835" />
-<TGConnectingPoint num="36" id="1836" />
-<TGConnectingPoint num="37" id="1837" />
-<TGConnectingPoint num="38" id="1838" />
-<TGConnectingPoint num="39" id="1839" />
+<infoparam name="State" value="calculate_receiving_message_Key" />
+<TGConnectingPoint num="0" id="1926" />
+<TGConnectingPoint num="1" id="1927" />
+<TGConnectingPoint num="2" id="1928" />
+<TGConnectingPoint num="3" id="1929" />
+<TGConnectingPoint num="4" id="1930" />
+<TGConnectingPoint num="5" id="1931" />
+<TGConnectingPoint num="6" id="1932" />
+<TGConnectingPoint num="7" id="1933" />
+<TGConnectingPoint num="8" id="1934" />
+<TGConnectingPoint num="9" id="1935" />
+<TGConnectingPoint num="10" id="1936" />
+<TGConnectingPoint num="11" id="1937" />
+<TGConnectingPoint num="12" id="1938" />
+<TGConnectingPoint num="13" id="1939" />
+<TGConnectingPoint num="14" id="1940" />
+<TGConnectingPoint num="15" id="1941" />
+<TGConnectingPoint num="16" id="1942" />
+<TGConnectingPoint num="17" id="1943" />
+<TGConnectingPoint num="18" id="1944" />
+<TGConnectingPoint num="19" id="1945" />
+<TGConnectingPoint num="20" id="1946" />
+<TGConnectingPoint num="21" id="1947" />
+<TGConnectingPoint num="22" id="1948" />
+<TGConnectingPoint num="23" id="1949" />
+<TGConnectingPoint num="24" id="1950" />
+<TGConnectingPoint num="25" id="1951" />
+<TGConnectingPoint num="26" id="1952" />
+<TGConnectingPoint num="27" id="1953" />
+<TGConnectingPoint num="28" id="1954" />
+<TGConnectingPoint num="29" id="1955" />
+<TGConnectingPoint num="30" id="1956" />
+<TGConnectingPoint num="31" id="1957" />
+<TGConnectingPoint num="32" id="1958" />
+<TGConnectingPoint num="33" id="1959" />
+<TGConnectingPoint num="34" id="1960" />
+<TGConnectingPoint num="35" id="1961" />
+<TGConnectingPoint num="36" id="1962" />
+<TGConnectingPoint num="37" id="1963" />
+<TGConnectingPoint num="38" id="1964" />
+<TGConnectingPoint num="39" id="1965" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="1851" >
-<cdparam x="152" y="2297" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2007" >
+<cdparam x="329" y="821" />
+<sizeparam width="154" height="30" 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="4000" />
-<infoparam name="Receive signal" value="chin(filler6)" />
-<TGConnectingPoint num="0" id="1841" />
-<TGConnectingPoint num="1" id="1842" />
-<TGConnectingPoint num="2" id="1843" />
-<TGConnectingPoint num="3" id="1844" />
-<TGConnectingPoint num="4" id="1845" />
-<TGConnectingPoint num="5" id="1846" />
-<TGConnectingPoint num="6" id="1847" />
-<TGConnectingPoint num="7" id="1848" />
-<TGConnectingPoint num="8" id="1849" />
-<TGConnectingPoint num="9" id="1850" />
+<infoparam name="State" value="KDF_RK_sending" />
+<TGConnectingPoint num="0" id="1967" />
+<TGConnectingPoint num="1" id="1968" />
+<TGConnectingPoint num="2" id="1969" />
+<TGConnectingPoint num="3" id="1970" />
+<TGConnectingPoint num="4" id="1971" />
+<TGConnectingPoint num="5" id="1972" />
+<TGConnectingPoint num="6" id="1973" />
+<TGConnectingPoint num="7" id="1974" />
+<TGConnectingPoint num="8" id="1975" />
+<TGConnectingPoint num="9" id="1976" />
+<TGConnectingPoint num="10" id="1977" />
+<TGConnectingPoint num="11" id="1978" />
+<TGConnectingPoint num="12" id="1979" />
+<TGConnectingPoint num="13" id="1980" />
+<TGConnectingPoint num="14" id="1981" />
+<TGConnectingPoint num="15" id="1982" />
+<TGConnectingPoint num="16" id="1983" />
+<TGConnectingPoint num="17" id="1984" />
+<TGConnectingPoint num="18" id="1985" />
+<TGConnectingPoint num="19" id="1986" />
+<TGConnectingPoint num="20" id="1987" />
+<TGConnectingPoint num="21" id="1988" />
+<TGConnectingPoint num="22" id="1989" />
+<TGConnectingPoint num="23" id="1990" />
+<TGConnectingPoint num="24" id="1991" />
+<TGConnectingPoint num="25" id="1992" />
+<TGConnectingPoint num="26" id="1993" />
+<TGConnectingPoint num="27" id="1994" />
+<TGConnectingPoint num="28" id="1995" />
+<TGConnectingPoint num="29" id="1996" />
+<TGConnectingPoint num="30" id="1997" />
+<TGConnectingPoint num="31" id="1998" />
+<TGConnectingPoint num="32" id="1999" />
+<TGConnectingPoint num="33" id="2000" />
+<TGConnectingPoint num="34" id="2001" />
+<TGConnectingPoint num="35" id="2002" />
+<TGConnectingPoint num="36" id="2003" />
+<TGConnectingPoint num="37" id="2004" />
+<TGConnectingPoint num="38" id="2005" />
+<TGConnectingPoint num="39" id="2006" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="1854" >
-<cdparam x="207" y="2145" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2048" >
+<cdparam x="309" y="688" />
+<sizeparam width="194" height="30" 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="4000" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1852" />
-<TGConnectingPoint num="1" id="1853" />
+<infoparam name="State" value="calculate_sending_DH" />
+<TGConnectingPoint num="0" id="2008" />
+<TGConnectingPoint num="1" id="2009" />
+<TGConnectingPoint num="2" id="2010" />
+<TGConnectingPoint num="3" id="2011" />
+<TGConnectingPoint num="4" id="2012" />
+<TGConnectingPoint num="5" id="2013" />
+<TGConnectingPoint num="6" id="2014" />
+<TGConnectingPoint num="7" id="2015" />
+<TGConnectingPoint num="8" id="2016" />
+<TGConnectingPoint num="9" id="2017" />
+<TGConnectingPoint num="10" id="2018" />
+<TGConnectingPoint num="11" id="2019" />
+<TGConnectingPoint num="12" id="2020" />
+<TGConnectingPoint num="13" id="2021" />
+<TGConnectingPoint num="14" id="2022" />
+<TGConnectingPoint num="15" id="2023" />
+<TGConnectingPoint num="16" id="2024" />
+<TGConnectingPoint num="17" id="2025" />
+<TGConnectingPoint num="18" id="2026" />
+<TGConnectingPoint num="19" id="2027" />
+<TGConnectingPoint num="20" id="2028" />
+<TGConnectingPoint num="21" id="2029" />
+<TGConnectingPoint num="22" id="2030" />
+<TGConnectingPoint num="23" id="2031" />
+<TGConnectingPoint num="24" id="2032" />
+<TGConnectingPoint num="25" id="2033" />
+<TGConnectingPoint num="26" id="2034" />
+<TGConnectingPoint num="27" id="2035" />
+<TGConnectingPoint num="28" id="2036" />
+<TGConnectingPoint num="29" id="2037" />
+<TGConnectingPoint num="30" id="2038" />
+<TGConnectingPoint num="31" id="2039" />
+<TGConnectingPoint num="32" id="2040" />
+<TGConnectingPoint num="33" id="2041" />
+<TGConnectingPoint num="34" id="2042" />
+<TGConnectingPoint num="35" id="2043" />
+<TGConnectingPoint num="36" id="2044" />
+<TGConnectingPoint num="37" id="2045" />
+<TGConnectingPoint num="38" id="2046" />
+<TGConnectingPoint num="39" id="2047" />
 <extraparam>
-<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1865" >
-<cdparam x="201" y="2231" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2089" >
+<cdparam x="324" y="473" />
+<sizeparam width="165" height="30" 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="4000" />
-<infoparam name="Send signal" value="chout(filler5)" />
-<TGConnectingPoint num="0" id="1855" />
-<TGConnectingPoint num="1" id="1856" />
-<TGConnectingPoint num="2" id="1857" />
-<TGConnectingPoint num="3" id="1858" />
-<TGConnectingPoint num="4" id="1859" />
-<TGConnectingPoint num="5" id="1860" />
-<TGConnectingPoint num="6" id="1861" />
-<TGConnectingPoint num="7" id="1862" />
-<TGConnectingPoint num="8" id="1863" />
-<TGConnectingPoint num="9" id="1864" />
+<infoparam name="State" value="KDF_RK_receiving" />
+<TGConnectingPoint num="0" id="2049" />
+<TGConnectingPoint num="1" id="2050" />
+<TGConnectingPoint num="2" id="2051" />
+<TGConnectingPoint num="3" id="2052" />
+<TGConnectingPoint num="4" id="2053" />
+<TGConnectingPoint num="5" id="2054" />
+<TGConnectingPoint num="6" id="2055" />
+<TGConnectingPoint num="7" id="2056" />
+<TGConnectingPoint num="8" id="2057" />
+<TGConnectingPoint num="9" id="2058" />
+<TGConnectingPoint num="10" id="2059" />
+<TGConnectingPoint num="11" id="2060" />
+<TGConnectingPoint num="12" id="2061" />
+<TGConnectingPoint num="13" id="2062" />
+<TGConnectingPoint num="14" id="2063" />
+<TGConnectingPoint num="15" id="2064" />
+<TGConnectingPoint num="16" id="2065" />
+<TGConnectingPoint num="17" id="2066" />
+<TGConnectingPoint num="18" id="2067" />
+<TGConnectingPoint num="19" id="2068" />
+<TGConnectingPoint num="20" id="2069" />
+<TGConnectingPoint num="21" id="2070" />
+<TGConnectingPoint num="22" id="2071" />
+<TGConnectingPoint num="23" id="2072" />
+<TGConnectingPoint num="24" id="2073" />
+<TGConnectingPoint num="25" id="2074" />
+<TGConnectingPoint num="26" id="2075" />
+<TGConnectingPoint num="27" id="2076" />
+<TGConnectingPoint num="28" id="2077" />
+<TGConnectingPoint num="29" id="2078" />
+<TGConnectingPoint num="30" id="2079" />
+<TGConnectingPoint num="31" id="2080" />
+<TGConnectingPoint num="32" id="2081" />
+<TGConnectingPoint num="33" id="2082" />
+<TGConnectingPoint num="34" id="2083" />
+<TGConnectingPoint num="35" id="2084" />
+<TGConnectingPoint num="36" id="2085" />
+<TGConnectingPoint num="37" id="2086" />
+<TGConnectingPoint num="38" id="2087" />
+<TGConnectingPoint num="39" id="2088" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5108" id="1868" >
-<cdparam x="199" y="1864" />
-<sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2130" >
+<cdparam x="320" y="308" />
+<sizeparam width="173" height="30" 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="4000" />
-<infoparam name="TGComponent" value="null" />
-<TGConnectingPoint num="0" id="1866" />
-<TGConnectingPoint num="1" id="1867" />
+<infoparam name="State" value="Calculate_receiv_DH" />
+<TGConnectingPoint num="0" id="2090" />
+<TGConnectingPoint num="1" id="2091" />
+<TGConnectingPoint num="2" id="2092" />
+<TGConnectingPoint num="3" id="2093" />
+<TGConnectingPoint num="4" id="2094" />
+<TGConnectingPoint num="5" id="2095" />
+<TGConnectingPoint num="6" id="2096" />
+<TGConnectingPoint num="7" id="2097" />
+<TGConnectingPoint num="8" id="2098" />
+<TGConnectingPoint num="9" id="2099" />
+<TGConnectingPoint num="10" id="2100" />
+<TGConnectingPoint num="11" id="2101" />
+<TGConnectingPoint num="12" id="2102" />
+<TGConnectingPoint num="13" id="2103" />
+<TGConnectingPoint num="14" id="2104" />
+<TGConnectingPoint num="15" id="2105" />
+<TGConnectingPoint num="16" id="2106" />
+<TGConnectingPoint num="17" id="2107" />
+<TGConnectingPoint num="18" id="2108" />
+<TGConnectingPoint num="19" id="2109" />
+<TGConnectingPoint num="20" id="2110" />
+<TGConnectingPoint num="21" id="2111" />
+<TGConnectingPoint num="22" id="2112" />
+<TGConnectingPoint num="23" id="2113" />
+<TGConnectingPoint num="24" id="2114" />
+<TGConnectingPoint num="25" id="2115" />
+<TGConnectingPoint num="26" id="2116" />
+<TGConnectingPoint num="27" id="2117" />
+<TGConnectingPoint num="28" id="2118" />
+<TGConnectingPoint num="29" id="2119" />
+<TGConnectingPoint num="30" id="2120" />
+<TGConnectingPoint num="31" id="2121" />
+<TGConnectingPoint num="32" id="2122" />
+<TGConnectingPoint num="33" id="2123" />
+<TGConnectingPoint num="34" id="2124" />
+<TGConnectingPoint num="35" id="2125" />
+<TGConnectingPoint num="36" id="2126" />
+<TGConnectingPoint num="37" id="2127" />
+<TGConnectingPoint num="38" id="2128" />
+<TGConnectingPoint num="39" id="2129" />
 <extraparam>
-<Data variable="tmp3" minValue="0" maxValue="10" functionId="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="1879" >
-<cdparam x="251" y="2092" />
-<sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2141" >
+<cdparam x="366" y="211" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(filler4)" />
-<TGConnectingPoint num="0" id="1869" />
-<TGConnectingPoint num="1" id="1870" />
-<TGConnectingPoint num="2" id="1871" />
-<TGConnectingPoint num="3" id="1872" />
-<TGConnectingPoint num="4" id="1873" />
-<TGConnectingPoint num="5" id="1874" />
-<TGConnectingPoint num="6" id="1875" />
-<TGConnectingPoint num="7" id="1876" />
-<TGConnectingPoint num="8" id="1877" />
-<TGConnectingPoint num="9" id="1878" />
+<infoparam name="Receive signal" value="chin(filler)" />
+<TGConnectingPoint num="0" id="2131" />
+<TGConnectingPoint num="1" id="2132" />
+<TGConnectingPoint num="2" id="2133" />
+<TGConnectingPoint num="3" id="2134" />
+<TGConnectingPoint num="4" id="2135" />
+<TGConnectingPoint num="5" id="2136" />
+<TGConnectingPoint num="6" id="2137" />
+<TGConnectingPoint num="7" id="2138" />
+<TGConnectingPoint num="8" id="2139" />
+<TGConnectingPoint num="9" id="2140" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1920" >
-<cdparam x="169" y="2011" />
-<sizeparam width="242" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2152" >
+<cdparam x="292" y="93" />
+<sizeparam width="230" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Sending_message" />
-<TGConnectingPoint num="0" id="1880" />
-<TGConnectingPoint num="1" id="1881" />
-<TGConnectingPoint num="2" id="1882" />
-<TGConnectingPoint num="3" id="1883" />
-<TGConnectingPoint num="4" id="1884" />
-<TGConnectingPoint num="5" id="1885" />
-<TGConnectingPoint num="6" id="1886" />
-<TGConnectingPoint num="7" id="1887" />
-<TGConnectingPoint num="8" id="1888" />
-<TGConnectingPoint num="9" id="1889" />
-<TGConnectingPoint num="10" id="1890" />
-<TGConnectingPoint num="11" id="1891" />
-<TGConnectingPoint num="12" id="1892" />
-<TGConnectingPoint num="13" id="1893" />
-<TGConnectingPoint num="14" id="1894" />
-<TGConnectingPoint num="15" id="1895" />
-<TGConnectingPoint num="16" id="1896" />
-<TGConnectingPoint num="17" id="1897" />
-<TGConnectingPoint num="18" id="1898" />
-<TGConnectingPoint num="19" id="1899" />
-<TGConnectingPoint num="20" id="1900" />
-<TGConnectingPoint num="21" id="1901" />
-<TGConnectingPoint num="22" id="1902" />
-<TGConnectingPoint num="23" id="1903" />
-<TGConnectingPoint num="24" id="1904" />
-<TGConnectingPoint num="25" id="1905" />
-<TGConnectingPoint num="26" id="1906" />
-<TGConnectingPoint num="27" id="1907" />
-<TGConnectingPoint num="28" id="1908" />
-<TGConnectingPoint num="29" id="1909" />
-<TGConnectingPoint num="30" id="1910" />
-<TGConnectingPoint num="31" id="1911" />
-<TGConnectingPoint num="32" id="1912" />
-<TGConnectingPoint num="33" id="1913" />
-<TGConnectingPoint num="34" id="1914" />
-<TGConnectingPoint num="35" id="1915" />
-<TGConnectingPoint num="36" id="1916" />
-<TGConnectingPoint num="37" id="1917" />
-<TGConnectingPoint num="38" id="1918" />
-<TGConnectingPoint num="39" id="1919" />
-<extraparam>
-</extraparam>
+<infoparam name="Send signal" value="chout(requestBobPublicKeyBundle)" />
+<TGConnectingPoint num="0" id="2142" />
+<TGConnectingPoint num="1" id="2143" />
+<TGConnectingPoint num="2" id="2144" />
+<TGConnectingPoint num="3" id="2145" />
+<TGConnectingPoint num="4" id="2146" />
+<TGConnectingPoint num="5" id="2147" />
+<TGConnectingPoint num="6" id="2148" />
+<TGConnectingPoint num="7" id="2149" />
+<TGConnectingPoint num="8" id="2150" />
+<TGConnectingPoint num="9" id="2151" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="1961" >
-<cdparam x="159" y="1786" />
-<sizeparam width="234" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5100" id="2154" >
+<cdparam x="400" y="50" />
+<sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Encryption" />
-<TGConnectingPoint num="0" id="1921" />
-<TGConnectingPoint num="1" id="1922" />
-<TGConnectingPoint num="2" id="1923" />
-<TGConnectingPoint num="3" id="1924" />
-<TGConnectingPoint num="4" id="1925" />
-<TGConnectingPoint num="5" id="1926" />
-<TGConnectingPoint num="6" id="1927" />
-<TGConnectingPoint num="7" id="1928" />
-<TGConnectingPoint num="8" id="1929" />
-<TGConnectingPoint num="9" id="1930" />
-<TGConnectingPoint num="10" id="1931" />
-<TGConnectingPoint num="11" id="1932" />
-<TGConnectingPoint num="12" id="1933" />
-<TGConnectingPoint num="13" id="1934" />
-<TGConnectingPoint num="14" id="1935" />
-<TGConnectingPoint num="15" id="1936" />
-<TGConnectingPoint num="16" id="1937" />
-<TGConnectingPoint num="17" id="1938" />
-<TGConnectingPoint num="18" id="1939" />
-<TGConnectingPoint num="19" id="1940" />
-<TGConnectingPoint num="20" id="1941" />
-<TGConnectingPoint num="21" id="1942" />
-<TGConnectingPoint num="22" id="1943" />
-<TGConnectingPoint num="23" id="1944" />
-<TGConnectingPoint num="24" id="1945" />
-<TGConnectingPoint num="25" id="1946" />
-<TGConnectingPoint num="26" id="1947" />
-<TGConnectingPoint num="27" id="1948" />
-<TGConnectingPoint num="28" id="1949" />
-<TGConnectingPoint num="29" id="1950" />
-<TGConnectingPoint num="30" id="1951" />
-<TGConnectingPoint num="31" id="1952" />
-<TGConnectingPoint num="32" id="1953" />
-<TGConnectingPoint num="33" id="1954" />
-<TGConnectingPoint num="34" id="1955" />
-<TGConnectingPoint num="35" id="1956" />
-<TGConnectingPoint num="36" id="1957" />
-<TGConnectingPoint num="37" id="1958" />
-<TGConnectingPoint num="38" id="1959" />
-<TGConnectingPoint num="39" id="1960" />
-<extraparam>
-</extraparam>
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2153" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2002" >
-<cdparam x="104" y="1666" />
-<sizeparam width="241" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+
+</AVATARStateMachineDiagramPanel>
+
+<AVATARStateMachineDiagramPanel name="Server" minX="10" maxX="2500" minY="10" maxY="1500" >
+<CONNECTOR type="5102" id="2161" >
+<cdparam x="409" y="158" />
+<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="2160" />
+<P1  x="407" y="117" id="2304" />
+<P2  x="407" y="136" id="2263" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2159" >
+<father id="2161" num="0" />
+<cdparam x="407" y="187" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Decryption" />
-<TGConnectingPoint num="0" id="1962" />
-<TGConnectingPoint num="1" id="1963" />
-<TGConnectingPoint num="2" id="1964" />
-<TGConnectingPoint num="3" id="1965" />
-<TGConnectingPoint num="4" id="1966" />
-<TGConnectingPoint num="5" id="1967" />
-<TGConnectingPoint num="6" id="1968" />
-<TGConnectingPoint num="7" id="1969" />
-<TGConnectingPoint num="8" id="1970" />
-<TGConnectingPoint num="9" id="1971" />
-<TGConnectingPoint num="10" id="1972" />
-<TGConnectingPoint num="11" id="1973" />
-<TGConnectingPoint num="12" id="1974" />
-<TGConnectingPoint num="13" id="1975" />
-<TGConnectingPoint num="14" id="1976" />
-<TGConnectingPoint num="15" id="1977" />
-<TGConnectingPoint num="16" id="1978" />
-<TGConnectingPoint num="17" id="1979" />
-<TGConnectingPoint num="18" id="1980" />
-<TGConnectingPoint num="19" id="1981" />
-<TGConnectingPoint num="20" id="1982" />
-<TGConnectingPoint num="21" id="1983" />
-<TGConnectingPoint num="22" id="1984" />
-<TGConnectingPoint num="23" id="1985" />
-<TGConnectingPoint num="24" id="1986" />
-<TGConnectingPoint num="25" id="1987" />
-<TGConnectingPoint num="26" id="1988" />
-<TGConnectingPoint num="27" id="1989" />
-<TGConnectingPoint num="28" id="1990" />
-<TGConnectingPoint num="29" id="1991" />
-<TGConnectingPoint num="30" id="1992" />
-<TGConnectingPoint num="31" id="1993" />
-<TGConnectingPoint num="32" id="1994" />
-<TGConnectingPoint num="33" id="1995" />
-<TGConnectingPoint num="34" id="1996" />
-<TGConnectingPoint num="35" id="1997" />
-<TGConnectingPoint num="36" id="1998" />
-<TGConnectingPoint num="37" id="1999" />
-<TGConnectingPoint num="38" id="2000" />
-<TGConnectingPoint num="39" id="2001" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2155" />
+<TGConnectingPoint num="1" id="2156" />
+<TGConnectingPoint num="2" id="2157" />
+<TGConnectingPoint num="3" id="2158" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2043" >
-<cdparam x="53" y="1541" />
-<sizeparam width="388" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2168" >
+<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="2167" />
+<P1  x="407" y="70" id="2314" />
+<P2  x="407" y="87" id="2303" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2166" >
+<father id="2168" num="0" />
+<cdparam x="416" y="103" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Message_Key_sending" />
-<TGConnectingPoint num="0" id="2003" />
-<TGConnectingPoint num="1" id="2004" />
-<TGConnectingPoint num="2" id="2005" />
-<TGConnectingPoint num="3" id="2006" />
-<TGConnectingPoint num="4" id="2007" />
-<TGConnectingPoint num="5" id="2008" />
-<TGConnectingPoint num="6" id="2009" />
-<TGConnectingPoint num="7" id="2010" />
-<TGConnectingPoint num="8" id="2011" />
-<TGConnectingPoint num="9" id="2012" />
-<TGConnectingPoint num="10" id="2013" />
-<TGConnectingPoint num="11" id="2014" />
-<TGConnectingPoint num="12" id="2015" />
-<TGConnectingPoint num="13" id="2016" />
-<TGConnectingPoint num="14" id="2017" />
-<TGConnectingPoint num="15" id="2018" />
-<TGConnectingPoint num="16" id="2019" />
-<TGConnectingPoint num="17" id="2020" />
-<TGConnectingPoint num="18" id="2021" />
-<TGConnectingPoint num="19" id="2022" />
-<TGConnectingPoint num="20" id="2023" />
-<TGConnectingPoint num="21" id="2024" />
-<TGConnectingPoint num="22" id="2025" />
-<TGConnectingPoint num="23" id="2026" />
-<TGConnectingPoint num="24" id="2027" />
-<TGConnectingPoint num="25" id="2028" />
-<TGConnectingPoint num="26" id="2029" />
-<TGConnectingPoint num="27" id="2030" />
-<TGConnectingPoint num="28" id="2031" />
-<TGConnectingPoint num="29" id="2032" />
-<TGConnectingPoint num="30" id="2033" />
-<TGConnectingPoint num="31" id="2034" />
-<TGConnectingPoint num="32" id="2035" />
-<TGConnectingPoint num="33" id="2036" />
-<TGConnectingPoint num="34" id="2037" />
-<TGConnectingPoint num="35" id="2038" />
-<TGConnectingPoint num="36" id="2039" />
-<TGConnectingPoint num="37" id="2040" />
-<TGConnectingPoint num="38" id="2041" />
-<TGConnectingPoint num="39" id="2042" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2162" />
+<TGConnectingPoint num="1" id="2163" />
+<TGConnectingPoint num="2" id="2164" />
+<TGConnectingPoint num="3" id="2165" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2084" >
-<cdparam x="153" y="1375" />
-<sizeparam width="225" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2175" >
+<cdparam x="395" y="270" />
+<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="2174" />
+<P1  x="407" y="166" id="2268" />
+<P2  x="407" y="186" id="2251" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2173" >
+<father id="2175" num="0" />
+<cdparam x="398" y="298" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="Message_Key_receiving" />
-<TGConnectingPoint num="0" id="2044" />
-<TGConnectingPoint num="1" id="2045" />
-<TGConnectingPoint num="2" id="2046" />
-<TGConnectingPoint num="3" id="2047" />
-<TGConnectingPoint num="4" id="2048" />
-<TGConnectingPoint num="5" id="2049" />
-<TGConnectingPoint num="6" id="2050" />
-<TGConnectingPoint num="7" id="2051" />
-<TGConnectingPoint num="8" id="2052" />
-<TGConnectingPoint num="9" id="2053" />
-<TGConnectingPoint num="10" id="2054" />
-<TGConnectingPoint num="11" id="2055" />
-<TGConnectingPoint num="12" id="2056" />
-<TGConnectingPoint num="13" id="2057" />
-<TGConnectingPoint num="14" id="2058" />
-<TGConnectingPoint num="15" id="2059" />
-<TGConnectingPoint num="16" id="2060" />
-<TGConnectingPoint num="17" id="2061" />
-<TGConnectingPoint num="18" id="2062" />
-<TGConnectingPoint num="19" id="2063" />
-<TGConnectingPoint num="20" id="2064" />
-<TGConnectingPoint num="21" id="2065" />
-<TGConnectingPoint num="22" id="2066" />
-<TGConnectingPoint num="23" id="2067" />
-<TGConnectingPoint num="24" id="2068" />
-<TGConnectingPoint num="25" id="2069" />
-<TGConnectingPoint num="26" id="2070" />
-<TGConnectingPoint num="27" id="2071" />
-<TGConnectingPoint num="28" id="2072" />
-<TGConnectingPoint num="29" id="2073" />
-<TGConnectingPoint num="30" id="2074" />
-<TGConnectingPoint num="31" id="2075" />
-<TGConnectingPoint num="32" id="2076" />
-<TGConnectingPoint num="33" id="2077" />
-<TGConnectingPoint num="34" id="2078" />
-<TGConnectingPoint num="35" id="2079" />
-<TGConnectingPoint num="36" id="2080" />
-<TGConnectingPoint num="37" id="2081" />
-<TGConnectingPoint num="38" id="2082" />
-<TGConnectingPoint num="39" id="2083" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2169" />
+<TGConnectingPoint num="1" id="2170" />
+<TGConnectingPoint num="2" id="2171" />
+<TGConnectingPoint num="3" id="2172" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2125" >
-<cdparam x="148" y="1231" />
-<sizeparam width="249" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2182" >
+<cdparam x="391" y="366" />
+<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="2181" />
+<P1  x="407" y="216" id="2252" />
+<P2  x="407" y="251" id="2211" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2180" >
+<father id="2182" num="0" />
+<cdparam x="394" y="377" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="KDF_receiving" />
-<TGConnectingPoint num="0" id="2085" />
-<TGConnectingPoint num="1" id="2086" />
-<TGConnectingPoint num="2" id="2087" />
-<TGConnectingPoint num="3" id="2088" />
-<TGConnectingPoint num="4" id="2089" />
-<TGConnectingPoint num="5" id="2090" />
-<TGConnectingPoint num="6" id="2091" />
-<TGConnectingPoint num="7" id="2092" />
-<TGConnectingPoint num="8" id="2093" />
-<TGConnectingPoint num="9" id="2094" />
-<TGConnectingPoint num="10" id="2095" />
-<TGConnectingPoint num="11" id="2096" />
-<TGConnectingPoint num="12" id="2097" />
-<TGConnectingPoint num="13" id="2098" />
-<TGConnectingPoint num="14" id="2099" />
-<TGConnectingPoint num="15" id="2100" />
-<TGConnectingPoint num="16" id="2101" />
-<TGConnectingPoint num="17" id="2102" />
-<TGConnectingPoint num="18" id="2103" />
-<TGConnectingPoint num="19" id="2104" />
-<TGConnectingPoint num="20" id="2105" />
-<TGConnectingPoint num="21" id="2106" />
-<TGConnectingPoint num="22" id="2107" />
-<TGConnectingPoint num="23" id="2108" />
-<TGConnectingPoint num="24" id="2109" />
-<TGConnectingPoint num="25" id="2110" />
-<TGConnectingPoint num="26" id="2111" />
-<TGConnectingPoint num="27" id="2112" />
-<TGConnectingPoint num="28" id="2113" />
-<TGConnectingPoint num="29" id="2114" />
-<TGConnectingPoint num="30" id="2115" />
-<TGConnectingPoint num="31" id="2116" />
-<TGConnectingPoint num="32" id="2117" />
-<TGConnectingPoint num="33" id="2118" />
-<TGConnectingPoint num="34" id="2119" />
-<TGConnectingPoint num="35" id="2120" />
-<TGConnectingPoint num="36" id="2121" />
-<TGConnectingPoint num="37" id="2122" />
-<TGConnectingPoint num="38" id="2123" />
-<TGConnectingPoint num="39" id="2124" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2176" />
+<TGConnectingPoint num="1" id="2177" />
+<TGConnectingPoint num="2" id="2178" />
+<TGConnectingPoint num="3" id="2179" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2166" >
-<cdparam x="183" y="1051" />
-<sizeparam width="293" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2189" >
+<cdparam x="396" y="458" />
+<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="2188" />
+<P1  x="407" y="281" id="2216" />
+<P2  x="407" y="309" id="2199" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2187" >
+<father id="2189" num="0" />
+<cdparam x="396" y="497" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="DH_receiving" />
-<TGConnectingPoint num="0" id="2126" />
-<TGConnectingPoint num="1" id="2127" />
-<TGConnectingPoint num="2" id="2128" />
-<TGConnectingPoint num="3" id="2129" />
-<TGConnectingPoint num="4" id="2130" />
-<TGConnectingPoint num="5" id="2131" />
-<TGConnectingPoint num="6" id="2132" />
-<TGConnectingPoint num="7" id="2133" />
-<TGConnectingPoint num="8" id="2134" />
-<TGConnectingPoint num="9" id="2135" />
-<TGConnectingPoint num="10" id="2136" />
-<TGConnectingPoint num="11" id="2137" />
-<TGConnectingPoint num="12" id="2138" />
-<TGConnectingPoint num="13" id="2139" />
-<TGConnectingPoint num="14" id="2140" />
-<TGConnectingPoint num="15" id="2141" />
-<TGConnectingPoint num="16" id="2142" />
-<TGConnectingPoint num="17" id="2143" />
-<TGConnectingPoint num="18" id="2144" />
-<TGConnectingPoint num="19" id="2145" />
-<TGConnectingPoint num="20" id="2146" />
-<TGConnectingPoint num="21" id="2147" />
-<TGConnectingPoint num="22" id="2148" />
-<TGConnectingPoint num="23" id="2149" />
-<TGConnectingPoint num="24" id="2150" />
-<TGConnectingPoint num="25" id="2151" />
-<TGConnectingPoint num="26" id="2152" />
-<TGConnectingPoint num="27" id="2153" />
-<TGConnectingPoint num="28" id="2154" />
-<TGConnectingPoint num="29" id="2155" />
-<TGConnectingPoint num="30" id="2156" />
-<TGConnectingPoint num="31" id="2157" />
-<TGConnectingPoint num="32" id="2158" />
-<TGConnectingPoint num="33" id="2159" />
-<TGConnectingPoint num="34" id="2160" />
-<TGConnectingPoint num="35" id="2161" />
-<TGConnectingPoint num="36" id="2162" />
-<TGConnectingPoint num="37" id="2163" />
-<TGConnectingPoint num="38" id="2164" />
-<TGConnectingPoint num="39" id="2165" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2183" />
+<TGConnectingPoint num="1" id="2184" />
+<TGConnectingPoint num="2" id="2185" />
+<TGConnectingPoint num="3" id="2186" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
 
-<COMPONENT type="5106" id="2207" >
-<cdparam x="207" y="809" />
-<sizeparam width="287" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<CONNECTOR type="5102" id="2196" >
+<cdparam x="389" y="553" />
+<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="2195" />
+<P1  x="407" y="339" id="2200" />
+<P2  x="407" y="362" id="2197" />
+<AutomaticDrawing  data="true" />
+</CONNECTOR><SUBCOMPONENT type="-1" id="2194" >
+<father id="2196" num="0" />
+<cdparam x="395" y="596" />
+<sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="KDF_RK_sending" />
-<TGConnectingPoint num="0" id="2167" />
-<TGConnectingPoint num="1" id="2168" />
-<TGConnectingPoint num="2" id="2169" />
-<TGConnectingPoint num="3" id="2170" />
-<TGConnectingPoint num="4" id="2171" />
-<TGConnectingPoint num="5" id="2172" />
-<TGConnectingPoint num="6" id="2173" />
-<TGConnectingPoint num="7" id="2174" />
-<TGConnectingPoint num="8" id="2175" />
-<TGConnectingPoint num="9" id="2176" />
-<TGConnectingPoint num="10" id="2177" />
-<TGConnectingPoint num="11" id="2178" />
-<TGConnectingPoint num="12" id="2179" />
-<TGConnectingPoint num="13" id="2180" />
-<TGConnectingPoint num="14" id="2181" />
-<TGConnectingPoint num="15" id="2182" />
-<TGConnectingPoint num="16" id="2183" />
-<TGConnectingPoint num="17" id="2184" />
-<TGConnectingPoint num="18" id="2185" />
-<TGConnectingPoint num="19" id="2186" />
-<TGConnectingPoint num="20" id="2187" />
-<TGConnectingPoint num="21" id="2188" />
-<TGConnectingPoint num="22" id="2189" />
-<TGConnectingPoint num="23" id="2190" />
-<TGConnectingPoint num="24" id="2191" />
-<TGConnectingPoint num="25" id="2192" />
-<TGConnectingPoint num="26" id="2193" />
-<TGConnectingPoint num="27" id="2194" />
-<TGConnectingPoint num="28" id="2195" />
-<TGConnectingPoint num="29" id="2196" />
-<TGConnectingPoint num="30" id="2197" />
-<TGConnectingPoint num="31" id="2198" />
-<TGConnectingPoint num="32" id="2199" />
-<TGConnectingPoint num="33" id="2200" />
-<TGConnectingPoint num="34" id="2201" />
-<TGConnectingPoint num="35" id="2202" />
-<TGConnectingPoint num="36" id="2203" />
-<TGConnectingPoint num="37" id="2204" />
-<TGConnectingPoint num="38" id="2205" />
-<TGConnectingPoint num="39" id="2206" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
+<TGConnectingPoint num="0" id="2190" />
+<TGConnectingPoint num="1" id="2191" />
+<TGConnectingPoint num="2" id="2192" />
+<TGConnectingPoint num="3" id="2193" />
 <extraparam>
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
+</SUBCOMPONENT>
+
+<COMPONENT type="5101" id="2198" >
+<cdparam x="397" y="367" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="2197" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2248" >
-<cdparam x="172" y="626" />
-<sizeparam width="393" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5103" id="2209" >
+<cdparam x="366" y="314" />
+<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="State" value="calculate_sending_DH" />
-<TGConnectingPoint num="0" id="2208" />
-<TGConnectingPoint num="1" id="2209" />
-<TGConnectingPoint num="2" id="2210" />
-<TGConnectingPoint num="3" id="2211" />
-<TGConnectingPoint num="4" id="2212" />
-<TGConnectingPoint num="5" id="2213" />
-<TGConnectingPoint num="6" id="2214" />
-<TGConnectingPoint num="7" id="2215" />
-<TGConnectingPoint num="8" id="2216" />
-<TGConnectingPoint num="9" id="2217" />
-<TGConnectingPoint num="10" id="2218" />
-<TGConnectingPoint num="11" id="2219" />
-<TGConnectingPoint num="12" id="2220" />
-<TGConnectingPoint num="13" id="2221" />
-<TGConnectingPoint num="14" id="2222" />
-<TGConnectingPoint num="15" id="2223" />
-<TGConnectingPoint num="16" id="2224" />
-<TGConnectingPoint num="17" id="2225" />
-<TGConnectingPoint num="18" id="2226" />
-<TGConnectingPoint num="19" id="2227" />
-<TGConnectingPoint num="20" id="2228" />
-<TGConnectingPoint num="21" id="2229" />
-<TGConnectingPoint num="22" id="2230" />
-<TGConnectingPoint num="23" id="2231" />
-<TGConnectingPoint num="24" id="2232" />
-<TGConnectingPoint num="25" id="2233" />
-<TGConnectingPoint num="26" id="2234" />
-<TGConnectingPoint num="27" id="2235" />
-<TGConnectingPoint num="28" id="2236" />
-<TGConnectingPoint num="29" id="2237" />
-<TGConnectingPoint num="30" id="2238" />
-<TGConnectingPoint num="31" id="2239" />
-<TGConnectingPoint num="32" id="2240" />
-<TGConnectingPoint num="33" id="2241" />
-<TGConnectingPoint num="34" id="2242" />
-<TGConnectingPoint num="35" id="2243" />
-<TGConnectingPoint num="36" id="2244" />
-<TGConnectingPoint num="37" id="2245" />
-<TGConnectingPoint num="38" id="2246" />
-<TGConnectingPoint num="39" id="2247" />
-<extraparam>
-</extraparam>
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Send signal" value="chout(filler)" />
+<TGConnectingPoint num="0" id="2199" />
+<TGConnectingPoint num="1" id="2200" />
+<TGConnectingPoint num="2" id="2201" />
+<TGConnectingPoint num="3" id="2202" />
+<TGConnectingPoint num="4" id="2203" />
+<TGConnectingPoint num="5" id="2204" />
+<TGConnectingPoint num="6" id="2205" />
+<TGConnectingPoint num="7" id="2206" />
+<TGConnectingPoint num="8" id="2207" />
+<TGConnectingPoint num="9" id="2208" />
 </COMPONENT>
 
-<COMPONENT type="5106" id="2289" >
-<cdparam x="249" y="487" />
-<sizeparam width="261" height="50" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2250" >
+<cdparam x="314" y="251" />
+<sizeparam width="186" height="30" 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="4000" />
-<infoparam name="State" value="sending_message" />
-<TGConnectingPoint num="0" id="2249" />
-<TGConnectingPoint num="1" id="2250" />
-<TGConnectingPoint num="2" id="2251" />
-<TGConnectingPoint num="3" id="2252" />
-<TGConnectingPoint num="4" id="2253" />
-<TGConnectingPoint num="5" id="2254" />
-<TGConnectingPoint num="6" id="2255" />
-<TGConnectingPoint num="7" id="2256" />
-<TGConnectingPoint num="8" id="2257" />
-<TGConnectingPoint num="9" id="2258" />
-<TGConnectingPoint num="10" id="2259" />
-<TGConnectingPoint num="11" id="2260" />
-<TGConnectingPoint num="12" id="2261" />
-<TGConnectingPoint num="13" id="2262" />
-<TGConnectingPoint num="14" id="2263" />
-<TGConnectingPoint num="15" id="2264" />
-<TGConnectingPoint num="16" id="2265" />
-<TGConnectingPoint num="17" id="2266" />
-<TGConnectingPoint num="18" id="2267" />
-<TGConnectingPoint num="19" id="2268" />
-<TGConnectingPoint num="20" id="2269" />
-<TGConnectingPoint num="21" id="2270" />
-<TGConnectingPoint num="22" id="2271" />
-<TGConnectingPoint num="23" id="2272" />
-<TGConnectingPoint num="24" id="2273" />
-<TGConnectingPoint num="25" id="2274" />
-<TGConnectingPoint num="26" id="2275" />
-<TGConnectingPoint num="27" id="2276" />
-<TGConnectingPoint num="28" id="2277" />
-<TGConnectingPoint num="29" id="2278" />
-<TGConnectingPoint num="30" id="2279" />
-<TGConnectingPoint num="31" id="2280" />
-<TGConnectingPoint num="32" id="2281" />
-<TGConnectingPoint num="33" id="2282" />
-<TGConnectingPoint num="34" id="2283" />
-<TGConnectingPoint num="35" id="2284" />
-<TGConnectingPoint num="36" id="2285" />
-<TGConnectingPoint num="37" id="2286" />
-<TGConnectingPoint num="38" id="2287" />
-<TGConnectingPoint num="39" id="2288" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="Receive_Alice_request" />
+<TGConnectingPoint num="0" id="2210" />
+<TGConnectingPoint num="1" id="2211" />
+<TGConnectingPoint num="2" id="2212" />
+<TGConnectingPoint num="3" id="2213" />
+<TGConnectingPoint num="4" id="2214" />
+<TGConnectingPoint num="5" id="2215" />
+<TGConnectingPoint num="6" id="2216" />
+<TGConnectingPoint num="7" id="2217" />
+<TGConnectingPoint num="8" id="2218" />
+<TGConnectingPoint num="9" id="2219" />
+<TGConnectingPoint num="10" id="2220" />
+<TGConnectingPoint num="11" id="2221" />
+<TGConnectingPoint num="12" id="2222" />
+<TGConnectingPoint num="13" id="2223" />
+<TGConnectingPoint num="14" id="2224" />
+<TGConnectingPoint num="15" id="2225" />
+<TGConnectingPoint num="16" id="2226" />
+<TGConnectingPoint num="17" id="2227" />
+<TGConnectingPoint num="18" id="2228" />
+<TGConnectingPoint num="19" id="2229" />
+<TGConnectingPoint num="20" id="2230" />
+<TGConnectingPoint num="21" id="2231" />
+<TGConnectingPoint num="22" id="2232" />
+<TGConnectingPoint num="23" id="2233" />
+<TGConnectingPoint num="24" id="2234" />
+<TGConnectingPoint num="25" id="2235" />
+<TGConnectingPoint num="26" id="2236" />
+<TGConnectingPoint num="27" id="2237" />
+<TGConnectingPoint num="28" id="2238" />
+<TGConnectingPoint num="29" id="2239" />
+<TGConnectingPoint num="30" id="2240" />
+<TGConnectingPoint num="31" id="2241" />
+<TGConnectingPoint num="32" id="2242" />
+<TGConnectingPoint num="33" id="2243" />
+<TGConnectingPoint num="34" id="2244" />
+<TGConnectingPoint num="35" id="2245" />
+<TGConnectingPoint num="36" id="2246" />
+<TGConnectingPoint num="37" id="2247" />
+<TGConnectingPoint num="38" id="2248" />
+<TGConnectingPoint num="39" id="2249" />
 <extraparam>
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="5104" id="2300" >
-<cdparam x="237" y="413" />
-<sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2261" >
+<cdparam x="293" y="191" />
+<sizeparam width="228" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Receive signal" value="chin(filler3)" />
-<TGConnectingPoint num="0" id="2290" />
-<TGConnectingPoint num="1" id="2291" />
-<TGConnectingPoint num="2" id="2292" />
-<TGConnectingPoint num="3" id="2293" />
-<TGConnectingPoint num="4" id="2294" />
-<TGConnectingPoint num="5" id="2295" />
-<TGConnectingPoint num="6" id="2296" />
-<TGConnectingPoint num="7" id="2297" />
-<TGConnectingPoint num="8" id="2298" />
-<TGConnectingPoint num="9" id="2299" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chin(requestBobPublicKeyBundle)" />
+<TGConnectingPoint num="0" id="2251" />
+<TGConnectingPoint num="1" id="2252" />
+<TGConnectingPoint num="2" id="2253" />
+<TGConnectingPoint num="3" id="2254" />
+<TGConnectingPoint num="4" id="2255" />
+<TGConnectingPoint num="5" id="2256" />
+<TGConnectingPoint num="6" id="2257" />
+<TGConnectingPoint num="7" id="2258" />
+<TGConnectingPoint num="8" id="2259" />
+<TGConnectingPoint num="9" id="2260" />
 </COMPONENT>
 
-<COMPONENT type="5101" id="2302" >
-<cdparam x="219" y="3433" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5106" id="2302" >
+<cdparam x="376" y="136" />
+<sizeparam width="63" height="30" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="stop state" value="null" />
-<TGConnectingPoint num="0" id="2301" />
+<enabled value="true" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="State" value="Store" />
+<TGConnectingPoint num="0" id="2262" />
+<TGConnectingPoint num="1" id="2263" />
+<TGConnectingPoint num="2" id="2264" />
+<TGConnectingPoint num="3" id="2265" />
+<TGConnectingPoint num="4" id="2266" />
+<TGConnectingPoint num="5" id="2267" />
+<TGConnectingPoint num="6" id="2268" />
+<TGConnectingPoint num="7" id="2269" />
+<TGConnectingPoint num="8" id="2270" />
+<TGConnectingPoint num="9" id="2271" />
+<TGConnectingPoint num="10" id="2272" />
+<TGConnectingPoint num="11" id="2273" />
+<TGConnectingPoint num="12" id="2274" />
+<TGConnectingPoint num="13" id="2275" />
+<TGConnectingPoint num="14" id="2276" />
+<TGConnectingPoint num="15" id="2277" />
+<TGConnectingPoint num="16" id="2278" />
+<TGConnectingPoint num="17" id="2279" />
+<TGConnectingPoint num="18" id="2280" />
+<TGConnectingPoint num="19" id="2281" />
+<TGConnectingPoint num="20" id="2282" />
+<TGConnectingPoint num="21" id="2283" />
+<TGConnectingPoint num="22" id="2284" />
+<TGConnectingPoint num="23" id="2285" />
+<TGConnectingPoint num="24" id="2286" />
+<TGConnectingPoint num="25" id="2287" />
+<TGConnectingPoint num="26" id="2288" />
+<TGConnectingPoint num="27" id="2289" />
+<TGConnectingPoint num="28" id="2290" />
+<TGConnectingPoint num="29" id="2291" />
+<TGConnectingPoint num="30" id="2292" />
+<TGConnectingPoint num="31" id="2293" />
+<TGConnectingPoint num="32" id="2294" />
+<TGConnectingPoint num="33" id="2295" />
+<TGConnectingPoint num="34" id="2296" />
+<TGConnectingPoint num="35" id="2297" />
+<TGConnectingPoint num="36" id="2298" />
+<TGConnectingPoint num="37" id="2299" />
+<TGConnectingPoint num="38" id="2300" />
+<TGConnectingPoint num="39" id="2301" />
+<extraparam>
+</extraparam>
 </COMPONENT>
 
-<COMPONENT type="5103" id="2313" >
-<cdparam x="263" y="181" />
-<sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="2313" >
+<cdparam x="367" y="92" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
-<infoparam name="Send signal" value="chout(filler)" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
+<infoparam name="Receive signal" value="chin(filler)" />
 <TGConnectingPoint num="0" id="2303" />
 <TGConnectingPoint num="1" id="2304" />
 <TGConnectingPoint num="2" id="2305" />
@@ -4900,10 +4900,10 @@
 </COMPONENT>
 
 <COMPONENT type="5100" id="2315" >
-<cdparam x="305" y="47" />
+<cdparam x="400" y="50" />
 <sizeparam width="15" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="4000" />
+<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
 <infoparam name="start state" value="null" />
 <TGConnectingPoint num="0" id="2314" />
 </COMPONENT>
diff --git a/modeling/SysMLSec/X3DH.xml b/modeling/SysMLSec/X3DH.xml
index 0e5b59af18986436476b264317fff8de29975941..96cbf446eac741ec1b2fe180a80db9564b59547e 100644
--- a/modeling/SysMLSec/X3DH.xml
+++ b/modeling/SysMLSec/X3DH.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <TURTLEGMODELING version="1.0beta">
 
 <Modeling type="AVATAR Design" nameTab="protocol" >
-<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" >
+<AVATARBlockDiagramPanel name="Block Diagram" minX="10" maxX="2500" minY="10" maxY="1500" zoom="1.0" >
 <MainCode value="void __user_init() {"/>
 <MainCode value="}"/>
 <Optimized value="true" />
-<Validated value="" />
+<Validated value="System;Bob;Alice;Server;" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="6" >
@@ -155,6 +155,7 @@
 <TGConnectingPoint num="22" id="139" />
 <TGConnectingPoint num="23" id="140" />
 <extraparam>
+<blockType data="block" color="-4072719" />
 <CryptoBlock value="false" />
 <Signal value="in chin(Message m)" attached="true" />
 <Signal value="out chout(Message m)" attached="true" />
@@ -192,6 +193,7 @@
 <TGConnectingPoint num="22" id="64" />
 <TGConnectingPoint num="23" id="65" />
 <extraparam>
+<blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
 <Attribute access="0" id="filler" value="" type="5" typeOther="Message" />
 <Attribute access="0" id="requestBobPublicKeyBundle" value="" type="5" typeOther="Message" />
@@ -249,6 +251,7 @@
 <TGConnectingPoint num="22" id="89" />
 <TGConnectingPoint num="23" id="90" />
 <extraparam>
+<blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
 <Attribute access="0" id="IK_a" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="IKs_a" value="" type="5" typeOther="Key" />
@@ -328,6 +331,7 @@
 <TGConnectingPoint num="22" id="114" />
 <TGConnectingPoint num="23" id="115" />
 <extraparam>
+<blockType data="cryptoblock" color="-4072719" />
 <CryptoBlock value="true" />
 <Attribute access="0" id="IK_b" value="" type="5" typeOther="Key" />
 <Attribute access="0" id="SPK_b" value="" type="5" typeOther="Key" />
@@ -405,6 +409,7 @@
 <cdparam x="625" y="1427" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="144" />
@@ -412,12 +417,12 @@
 <TGConnectingPoint num="2" id="146" />
 <TGConnectingPoint num="3" id="147" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -434,6 +439,7 @@
 <cdparam x="435" y="845" />
 <sizeparam width="249" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="151" />
@@ -441,13 +447,13 @@
 <TGConnectingPoint num="2" id="153" />
 <TGConnectingPoint num="3" id="154" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="AD_uncipher = sdecrypt(AD_cipher, SK) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="AD_uncipher = sdecrypt(AD_cipher, SK) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -464,6 +470,7 @@
 <cdparam x="444" y="916" />
 <sizeparam width="257" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="158" />
@@ -471,12 +478,12 @@
 <TGConnectingPoint num="2" id="160" />
 <TGConnectingPoint num="3" id="161" />
 <extraparam>
-<guard value="[ AD.Message == AD_uncipher.Message]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ AD.Message == AD_uncipher.Message]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -493,6 +500,7 @@
 <cdparam x="444" y="448" />
 <sizeparam width="152" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="165" />
@@ -500,13 +508,13 @@
 <TGConnectingPoint num="2" id="167" />
 <TGConnectingPoint num="3" id="168" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH1 = DH(IK_a, SPKs_b) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH1 = DH(IK_a, SPKs_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -523,6 +531,7 @@
 <cdparam x="439" y="227" />
 <sizeparam width="227" height="45" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="172" />
@@ -530,15 +539,15 @@
 <TGConnectingPoint num="2" id="174" />
 <TGConnectingPoint num="3" id="175" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="get3(filler2, tmp1, tmp2, AD_cipher )" />
-<actions value="IK_a.Key = tmp1.Message" />
-<actions value="EC_a.Key = tmp2.Message " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="get3(filler2, tmp1, tmp2, AD_cipher )" enabled="true"/>
+<actions value="IK_a.Key = tmp1.Message" enabled="true"/>
+<actions value="EC_a.Key = tmp2.Message " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -555,6 +564,7 @@
 <cdparam x="446" y="75" />
 <sizeparam width="225" height="60" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="179" />
@@ -562,16 +572,16 @@
 <TGConnectingPoint num="2" id="181" />
 <TGConnectingPoint num="3" id="182" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = IK_b.Key" />
-<actions value="tmp2.Message = SPK_b.Key" />
-<actions value="tmp4 = sign(tmp2,IKs_b )" />
-<actions value="filler = concat3(tmp1, tmp2,tmp4  ) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = IK_b.Key" enabled="true"/>
+<actions value="tmp2.Message = SPK_b.Key" enabled="true"/>
+<actions value="tmp4 = sign(tmp2,IKs_b )" enabled="true"/>
+<actions value="filler = concat3(tmp1, tmp2,tmp4  ) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -588,6 +598,7 @@
 <cdparam x="412" y="214" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="186" />
@@ -595,12 +606,12 @@
 <TGConnectingPoint num="2" id="188" />
 <TGConnectingPoint num="3" id="189" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -617,6 +628,7 @@
 <cdparam x="440" y="326" />
 <sizeparam width="186" height="60" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="193" />
@@ -624,15 +636,15 @@
 <TGConnectingPoint num="2" id="195" />
 <TGConnectingPoint num="3" id="196" />
 <extraparam>
-<guard value="[ IK_a.Key==preload_IK_a.Key]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = IK_a.Key" />
-<actions value="tmp2.Message = IK_b.Key" />
-<actions value="AD = concat2(tmp1, tmp2) " />
+<guard value="[ IK_a.Key==preload_IK_a.Key]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = IK_a.Key" enabled="true"/>
+<actions value="tmp2.Message = IK_b.Key" enabled="true"/>
+<actions value="AD = concat2(tmp1, tmp2) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -649,6 +661,7 @@
 <cdparam x="444" y="520" />
 <sizeparam width="145" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="200" />
@@ -656,13 +669,13 @@
 <TGConnectingPoint num="2" id="202" />
 <TGConnectingPoint num="3" id="203" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH2 = DH(EC_a, IKs_b) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH2 = DH(EC_a, IKs_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -679,6 +692,7 @@
 <cdparam x="439" y="592" />
 <sizeparam width="158" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="207" />
@@ -686,13 +700,13 @@
 <TGConnectingPoint num="2" id="209" />
 <TGConnectingPoint num="3" id="210" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH3 = DH(EC_a, SPKs_b) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH3 = DH(EC_a, SPKs_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -709,6 +723,7 @@
 <cdparam x="433" y="679" />
 <sizeparam width="219" height="90" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="214" />
@@ -716,18 +731,18 @@
 <TGConnectingPoint num="2" id="216" />
 <TGConnectingPoint num="3" id="217" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = DH1.Key" />
-<actions value="tmp2.Message = DH2.Key" />
-<actions value="tmp4.Message = DH3.Key" />
-<actions value="tmp4 = concat3(tmp1,tmp2, tmp4)" />
-<actions value="tmp4 = hash(tmp4) " />
-<actions value="SK.Key = tmp4.Message" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = DH1.Key" enabled="true"/>
+<actions value="tmp2.Message = DH2.Key" enabled="true"/>
+<actions value="tmp4.Message = DH3.Key" enabled="true"/>
+<actions value="tmp4 = concat3(tmp1,tmp2, tmp4)" enabled="true"/>
+<actions value="tmp4 = hash(tmp4) " enabled="true"/>
+<actions value="SK.Key = tmp4.Message" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -744,6 +759,7 @@
 <cdparam x="487" y="1005" />
 <sizeparam width="197" height="45" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="221" />
@@ -751,15 +767,15 @@
 <TGConnectingPoint num="2" id="223" />
 <TGConnectingPoint num="3" id="224" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = MSG" />
-<actions value="tmp1 = concat2(tmp1, m)" />
-<actions value="m_cipher = sencrypt(tmp1, SK) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = MSG" enabled="true"/>
+<actions value="tmp1 = concat2(tmp1, m)" enabled="true"/>
+<actions value="m_cipher = sencrypt(tmp1, SK) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -767,6 +783,7 @@
 <cdparam x="396" y="1063" />
 <sizeparam width="112" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Send signal" value="chout(m_cipher)" />
 <TGConnectingPoint num="0" id="228" />
@@ -794,6 +811,7 @@
 <cdparam x="375" y="946" />
 <sizeparam width="155" height="30" 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="2000" />
 <infoparam name="State" value="Alice_Binding_OK" />
 <TGConnectingPoint num="0" id="241" />
@@ -844,6 +862,7 @@
 <cdparam x="344" y="866" />
 <sizeparam width="127" height="30" 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="2000" />
 <infoparam name="State" value="Verify_AD" />
 <TGConnectingPoint num="0" id="282" />
@@ -894,6 +913,7 @@
 <cdparam x="318" y="782" />
 <sizeparam width="179" height="30" 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="2000" />
 <infoparam name="State" value="CalculateSecretKey" />
 <TGConnectingPoint num="0" id="323" />
@@ -944,6 +964,7 @@
 <cdparam x="357" y="610" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH3" />
 <TGConnectingPoint num="0" id="364" />
@@ -994,6 +1015,7 @@
 <cdparam x="357" y="536" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH2" />
 <TGConnectingPoint num="0" id="405" />
@@ -1044,6 +1066,7 @@
 <cdparam x="357" y="466" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH1" />
 <TGConnectingPoint num="0" id="446" />
@@ -1094,6 +1117,7 @@
 <cdparam x="343" y="386" />
 <sizeparam width="129" height="30" 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="2000" />
 <infoparam name="State" value="Calc_Public_AD" />
 <TGConnectingPoint num="0" id="487" />
@@ -1144,6 +1168,7 @@
 <cdparam x="304" y="273" />
 <sizeparam width="206" height="31" 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="2000" />
 <infoparam name="State" value="Retrieve_Alice_message" />
 <TGConnectingPoint num="0" id="528" />
@@ -1194,6 +1219,7 @@
 <cdparam x="363" y="186" />
 <sizeparam width="88" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Receive signal" value="chin(filler2)" />
 <TGConnectingPoint num="0" id="569" />
@@ -1212,6 +1238,7 @@
 <cdparam x="366" y="141" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Send signal" value="chout(filler)" />
 <TGConnectingPoint num="0" id="580" />
@@ -1252,6 +1279,7 @@
 <cdparam x="635" y="490" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="593" />
@@ -1259,12 +1287,12 @@
 <TGConnectingPoint num="2" id="595" />
 <TGConnectingPoint num="3" id="596" />
 <extraparam>
-<guard value="[else ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[else ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1281,6 +1309,7 @@
 <cdparam x="381" y="1525" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="600" />
@@ -1288,12 +1317,12 @@
 <TGConnectingPoint num="2" id="602" />
 <TGConnectingPoint num="3" id="603" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1310,6 +1339,7 @@
 <cdparam x="179" y="946" />
 <sizeparam width="229" height="150" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="607" />
@@ -1317,22 +1347,22 @@
 <TGConnectingPoint num="2" id="609" />
 <TGConnectingPoint num="3" id="610" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = DH1.Key" />
-<actions value="tmp2.Message = DH2.Key" />
-<actions value="tmp4.Message = DH3.Key" />
-<actions value="tmp4= concat3(tmp1, tmp2, tmp4)" />
-<actions value="tmp4= hash(tmp4)" />
-<actions value="tmp1.Message = IK_a.Key" />
-<actions value="tmp2.Message = EC_a.Key" />
-<actions value="SK.Key = tmp4.Message" />
-<actions value="tmp4= sencrypt(AD, SK)" />
-<actions value="filler2 = concat3(tmp1, tmp2,tmp4 ) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = DH1.Key" enabled="true"/>
+<actions value="tmp2.Message = DH2.Key" enabled="true"/>
+<actions value="tmp4.Message = DH3.Key" enabled="true"/>
+<actions value="tmp4= concat3(tmp1, tmp2, tmp4)" enabled="true"/>
+<actions value="tmp4= hash(tmp4)" enabled="true"/>
+<actions value="tmp1.Message = IK_a.Key" enabled="true"/>
+<actions value="tmp2.Message = EC_a.Key" enabled="true"/>
+<actions value="SK.Key = tmp4.Message" enabled="true"/>
+<actions value="tmp4= sencrypt(AD, SK)" enabled="true"/>
+<actions value="filler2 = concat3(tmp1, tmp2,tmp4 ) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1349,6 +1379,7 @@
 <cdparam x="230" y="857" />
 <sizeparam width="158" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="614" />
@@ -1356,13 +1387,13 @@
 <TGConnectingPoint num="2" id="616" />
 <TGConnectingPoint num="3" id="617" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH3 = DH(SPK_b, ECs_a) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH3 = DH(SPK_b, ECs_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1379,6 +1410,7 @@
 <cdparam x="246" y="766" />
 <sizeparam width="145" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="621" />
@@ -1386,13 +1418,13 @@
 <TGConnectingPoint num="2" id="623" />
 <TGConnectingPoint num="3" id="624" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH2 = DH(IK_b, ECs_a) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH2 = DH(IK_b, ECs_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1409,6 +1441,7 @@
 <cdparam x="241" y="678" />
 <sizeparam width="152" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="628" />
@@ -1416,13 +1449,13 @@
 <TGConnectingPoint num="2" id="630" />
 <TGConnectingPoint num="3" id="631" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="DH1 = DH(SPK_b, IKs_a) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="DH1 = DH(SPK_b, IKs_a) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1439,6 +1472,7 @@
 <cdparam x="258" y="574" />
 <sizeparam width="112" height="30" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="635" />
@@ -1446,14 +1480,14 @@
 <TGConnectingPoint num="2" id="637" />
 <TGConnectingPoint num="3" id="638" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="ECs_a.Key = tmp3" />
-<actions value="EC_a = pk(ECs_a)" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="ECs_a.Key = tmp3" enabled="true"/>
+<actions value="EC_a = pk(ECs_a)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1470,6 +1504,7 @@
 <cdparam x="518" y="311" />
 <sizeparam width="168" height="60" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="642" />
@@ -1477,15 +1512,15 @@
 <TGConnectingPoint num="2" id="644" />
 <TGConnectingPoint num="3" id="645" />
 <extraparam>
-<guard value="[b ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1.Message = IK_a.Key" />
-<actions value="tmp2.Message = IK_b.Key" />
-<actions value="AD = concat2(tmp1, tmp2)" />
+<guard value="[b ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1.Message = IK_a.Key" enabled="true"/>
+<actions value="tmp2.Message = IK_b.Key" enabled="true"/>
+<actions value="AD = concat2(tmp1, tmp2)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1502,6 +1537,7 @@
 <cdparam x="260" y="322" />
 <sizeparam width="40" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="649" />
@@ -1509,12 +1545,12 @@
 <TGConnectingPoint num="2" id="651" />
 <TGConnectingPoint num="3" id="652" />
 <extraparam>
-<guard value="[else ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[else ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1531,6 +1567,7 @@
 <cdparam x="416" y="91" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="656" />
@@ -1538,12 +1575,12 @@
 <TGConnectingPoint num="2" id="658" />
 <TGConnectingPoint num="3" id="659" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1560,6 +1597,7 @@
 <cdparam x="421" y="169" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="663" />
@@ -1567,12 +1605,12 @@
 <TGConnectingPoint num="2" id="665" />
 <TGConnectingPoint num="3" id="666" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1589,6 +1627,7 @@
 <cdparam x="427" y="208" />
 <sizeparam width="197" height="60" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="670" />
@@ -1596,16 +1635,16 @@
 <TGConnectingPoint num="2" id="672" />
 <TGConnectingPoint num="3" id="673" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="get3(filler, tmp1, tmp2, sign) " />
-<actions value="IK_b.Key = tmp1.Message" />
-<actions value="SPK_b.Key = tmp2.Message" />
-<actions value="b = verifySign(tmp2, sign, IK_b) " />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="get3(filler, tmp1, tmp2, sign) " enabled="true"/>
+<actions value="IK_b.Key = tmp1.Message" enabled="true"/>
+<actions value="SPK_b.Key = tmp2.Message" enabled="true"/>
+<actions value="b = verifySign(tmp2, sign, IK_b) " enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1622,6 +1661,7 @@
 <cdparam x="219" y="491" />
 <sizeparam width="186" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="677" />
@@ -1629,12 +1669,12 @@
 <TGConnectingPoint num="2" id="679" />
 <TGConnectingPoint num="3" id="680" />
 <extraparam>
-<guard value="[IK_b.Key== preload_IK_b.Key]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[IK_b.Key== preload_IK_b.Key]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1651,6 +1691,7 @@
 <cdparam x="214" y="1227" />
 <sizeparam width="193" height="30" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="684" />
@@ -1658,14 +1699,14 @@
 <TGConnectingPoint num="2" id="686" />
 <TGConnectingPoint num="3" id="687" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
-<actions value="tmp1 = sdecrypt(m_cipher, SK)" />
-<actions value="get2(tmp1, tmp1, m)" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
+<actions value="tmp1 = sdecrypt(m_cipher, SK)" enabled="true"/>
+<actions value="get2(tmp1, tmp1, m)" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1682,6 +1723,7 @@
 <cdparam x="321" y="438" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="691" />
@@ -1689,12 +1731,12 @@
 <TGConnectingPoint num="2" id="693" />
 <TGConnectingPoint num="3" id="694" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1711,6 +1753,7 @@
 <cdparam x="659" y="567" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="698" />
@@ -1718,12 +1761,12 @@
 <TGConnectingPoint num="2" id="700" />
 <TGConnectingPoint num="3" id="701" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1740,6 +1783,7 @@
 <cdparam x="459" y="1318" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="705" />
@@ -1747,12 +1791,12 @@
 <TGConnectingPoint num="2" id="707" />
 <TGConnectingPoint num="3" id="708" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1769,6 +1813,7 @@
 <cdparam x="241" y="1319" />
 <sizeparam width="157" height="15" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="List of all parameters of an Avatar SMD transition" value="" />
 <TGConnectingPoint num="0" id="712" />
@@ -1776,12 +1821,12 @@
 <TGConnectingPoint num="2" id="714" />
 <TGConnectingPoint num="3" id="715" />
 <extraparam>
-<guard value="[tmp1.Message == MSG]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[tmp1.Message == MSG]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1789,6 +1834,7 @@
 <cdparam x="365" y="1338" />
 <sizeparam width="110" height="30" 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="2000" />
 <infoparam name="State" value="MDecrypted" />
 <TGConnectingPoint num="0" id="719" />
@@ -1866,6 +1912,7 @@
 <cdparam x="551" y="518" />
 <sizeparam width="147" height="30" 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="2000" />
 <infoparam name="State" value="error_bob_identity" />
 <TGConnectingPoint num="0" id="766" />
@@ -1916,6 +1963,7 @@
 <cdparam x="370" y="1263" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="DecryptM" />
 <TGConnectingPoint num="0" id="807" />
@@ -1966,6 +2014,7 @@
 <cdparam x="365" y="1182" />
 <sizeparam width="110" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Receive signal" value="chin(m_cipher)" />
 <TGConnectingPoint num="0" id="848" />
@@ -1984,6 +2033,7 @@
 <cdparam x="335" y="882" />
 <sizeparam width="170" height="30" 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="2000" />
 <infoparam name="State" value="CalculateSecretKey" />
 <TGConnectingPoint num="0" id="859" />
@@ -2034,6 +2084,7 @@
 <cdparam x="370" y="788" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH3" />
 <TGConnectingPoint num="0" id="900" />
@@ -2084,6 +2135,7 @@
 <cdparam x="370" y="702" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH2" />
 <TGConnectingPoint num="0" id="941" />
@@ -2134,6 +2186,7 @@
 <cdparam x="370" y="619" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="CalcDH1" />
 <TGConnectingPoint num="0" id="982" />
@@ -2184,6 +2237,7 @@
 <cdparam x="339" y="523" />
 <sizeparam width="163" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="TGComponent" value="null" />
 <TGConnectingPoint num="0" id="1023" />
@@ -2197,6 +2251,7 @@
 <cdparam x="375" y="1126" />
 <sizeparam width="90" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Send signal" value="chout(filler2)" />
 <TGConnectingPoint num="0" id="1026" />
@@ -2215,6 +2270,7 @@
 <cdparam x="439" y="391" />
 <sizeparam width="162" height="30" 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="2000" />
 <infoparam name="State" value="GenerateEcKey" />
 <TGConnectingPoint num="0" id="1037" />
@@ -2265,6 +2321,7 @@
 <cdparam x="246" y="388" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="error" />
 <TGConnectingPoint num="0" id="1078" />
@@ -2315,6 +2372,7 @@
 <cdparam x="357" y="273" />
 <sizeparam width="100" height="30" 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="2000" />
 <infoparam name="State" value="Verify_Sign" />
 <TGConnectingPoint num="0" id="1119" />
@@ -2365,6 +2423,7 @@
 <cdparam x="367" y="151" />
 <sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Receive signal" value="chin(filler)" />
 <TGConnectingPoint num="0" id="1160" />
@@ -2383,6 +2442,7 @@
 <cdparam x="292" y="97" />
 <sizeparam width="230" height="20" minWidth="30" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
+<enabled value="true" />
 <cdrectangleparam minX="10" maxX="2500" minY="10" maxY="2000" />
 <infoparam name="Send signal" value="chout(requestBobPublicKeyBundle)" />
 <TGConnectingPoint num="0" id="1171" />
@@ -2423,6 +2483,7 @@
 <cdparam x="407" y="187" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1184" />
@@ -2430,12 +2491,12 @@
 <TGConnectingPoint num="2" id="1186" />
 <TGConnectingPoint num="3" id="1187" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2452,6 +2513,7 @@
 <cdparam x="416" y="103" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1191" />
@@ -2459,12 +2521,12 @@
 <TGConnectingPoint num="2" id="1193" />
 <TGConnectingPoint num="3" id="1194" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2481,6 +2543,7 @@
 <cdparam x="398" y="298" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1198" />
@@ -2488,12 +2551,12 @@
 <TGConnectingPoint num="2" id="1200" />
 <TGConnectingPoint num="3" id="1201" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2510,6 +2573,7 @@
 <cdparam x="394" y="377" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1205" />
@@ -2517,12 +2581,12 @@
 <TGConnectingPoint num="2" id="1207" />
 <TGConnectingPoint num="3" id="1208" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2539,6 +2603,7 @@
 <cdparam x="396" y="497" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1212" />
@@ -2546,12 +2611,12 @@
 <TGConnectingPoint num="2" id="1214" />
 <TGConnectingPoint num="3" id="1215" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2568,6 +2633,7 @@
 <cdparam x="395" y="596" />
 <sizeparam width="10" height="15" minWidth="0" minHeight="0" 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="" />
 <TGConnectingPoint num="0" id="1219" />
@@ -2575,12 +2641,12 @@
 <TGConnectingPoint num="2" id="1221" />
 <TGConnectingPoint num="3" id="1222" />
 <extraparam>
-<guard value="[ ]" />
-<afterMin value="" />
-<afterMax value="" />
-<computeMin value="" />
-<computeMax value="" />
-<probability value="" />
+<guard value="[ ]" enabled="true"/>
+<afterMin value="" enabled="true"/>
+<afterMax value="" enabled="true"/>
+<computeMin value="" enabled="true"/>
+<computeMax value="" enabled="true"/>
+<probability value="" enabled="true"/>
 </extraparam>
 </SUBCOMPONENT>
 
@@ -2597,6 +2663,7 @@
 <cdparam x="366" y="315" />
 <sizeparam width="82" height="20" minWidth="30" minHeight="0" 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="Send signal" value="chout(filler)" />
 <TGConnectingPoint num="0" id="1228" />
@@ -2615,6 +2682,7 @@
 <cdparam x="312" y="254" />
 <sizeparam width="190" height="30" 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="State" value="Receive_Alice_request" />
 <TGConnectingPoint num="0" id="1239" />
@@ -2665,6 +2733,7 @@
 <cdparam x="293" y="198" />
 <sizeparam width="228" height="20" minWidth="30" minHeight="0" 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="Receive signal" value="chin(requestBobPublicKeyBundle)" />
 <TGConnectingPoint num="0" id="1280" />
@@ -2683,6 +2752,7 @@
 <cdparam x="370" y="133" />
 <sizeparam width="74" height="30" 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="State" value="Store" />
 <TGConnectingPoint num="0" id="1291" />
@@ -2733,6 +2803,7 @@
 <cdparam x="367" y="87" />
 <sizeparam width="80" height="20" minWidth="30" minHeight="0" 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="Receive signal" value="chin(filler)" />
 <TGConnectingPoint num="0" id="1332" />
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index cfd578d82d79bf90676eeff651c32b3c727e583d..a2cc34deed9e58f2d01bb8139c0811ffa9d5cd4a 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -2676,6 +2676,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                     System.err.println(e.getMessage() + " : Can't load config file.");
             }
             SpecConfigTTool.setDirConfig(tmpDir);
+        } else {
+            SpecConfigTTool.setBasicConfig(systemcOn);
         }
 
         file = tmpFile;
@@ -2797,7 +2799,8 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
                             final String actionMessage) {
         gtm.enableUndo(false);
 
-        // load the new TURTLE modeling
+        TraceManager.addDev("Loading model");
+        // load the new TTool modeling
         try {
             gtm.loadModelingFromXML(xmlModel);
             frame.setTitle("TTool: " + file.getAbsolutePath());